FreeBSD Bugzilla – Attachment 199084 Details for
Bug 229021
devel/p4 Fails to build with OpenSSL 1.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
New version of patch that works on old and new OpenSSL versions
patch-netsslcredentials.cc (text/plain), 798 bytes, created by
Kenneth D. Merry
on 2018-11-08 18:23:51 UTC
(
hide
)
Description:
New version of patch that works on old and new OpenSSL versions
Filename:
MIME Type:
Creator:
Kenneth D. Merry
Created:
2018-11-08 18:23:51 UTC
Size:
798 bytes
patch
obsolete
>--- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000 >+++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000 >@@ -42,6 +42,7 @@ extern "C" > # include <openssl/x509v3.h> > # include <openssl/ssl.h> > # include <openssl/x509_vfy.h> >+# include <openssl/opensslv.h> > } > # include <stdio.h> > # include "netdebug.h" >@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) > privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL ); > SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError ); > // verify that RSA key >+#if OPENSSL_VERSION_NUMBER < 0x10100000L > if (privateKey->type != EVP_PKEY_RSA) >+#else >+ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA) >+#endif > { > e->Set( MsgRpc::SslKeyNotRSA ); > goto fail;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=199084">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 229021
:
198708
|
199027
|
199028
|
199033
|
199071
| 199084