diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-09-10 09:37:39 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-09-10 09:37:39 +0000 |
| commit | 4c04b51c3f033749d6ed5759183e0705fd5f6cdd (patch) | |
| tree | d6fb214e061c501b0a20c648cc5f3cc5d0a8038e /security | |
| parent | - Fix LICENSE (diff) | |
Unbreak the build against modern versions of OpenSSL.
Diffstat (limited to 'security')
| -rw-r--r-- | security/sslsniffer/Makefile | 9 | ||||
| -rw-r--r-- | security/sslsniffer/files/patch-sslsniffer.c | 26 |
2 files changed, 27 insertions, 8 deletions
diff --git a/security/sslsniffer/Makefile b/security/sslsniffer/Makefile index 3a0681eaf233..cff81d2bcf35 100644 --- a/security/sslsniffer/Makefile +++ b/security/sslsniffer/Makefile @@ -21,13 +21,6 @@ PLIST_FILES= bin/sslsniffer OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -.if ${SSL_DEFAULT} == base -BROKEN_FreeBSD_12= incomplete definition of type 'struct evp_pkey_st' -BROKEN_FreeBSD_13= incomplete definition of type 'struct evp_pkey_st' -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sslsniffer ${STAGEDIR}${PREFIX}/bin @@ -35,4 +28,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/sslsniffer/files/patch-sslsniffer.c b/security/sslsniffer/files/patch-sslsniffer.c new file mode 100644 index 000000000000..60822ba100eb --- /dev/null +++ b/security/sslsniffer/files/patch-sslsniffer.c @@ -0,0 +1,26 @@ +--- sslsniffer.c.orig 2001-10-08 22:10:44 UTC ++++ sslsniffer.c +@@ -1573,14 +1573,22 @@ PrintCertificateInfo(UTL_CERT_INFO *buf, EVP_PKEY *key + + if (key == NULL) return; + +- switch (key->type) ++ switch (EVP_PKEY_id(key)) + { + case EVP_PKEY_RSA: ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + buf->keysize = RSA_size(key->pkey.rsa)*8; ++#else ++ buf->keysize = RSA_size(EVP_PKEY_get0_RSA(key))*8; ++#endif + printf(" RSA Public key size %d bits\n\n",buf->keysize); + break; + case EVP_PKEY_DSA: ++#if OPENSSL_VERSION_NUMBER < 0x10100005L + buf->keysize = DSA_size(key->pkey.dsa)*8; ++#else ++ buf->keysize = DSA_size(EVP_PKEY_get0_DSA(key))*8; ++#endif + printf(" DSS Public key size %d bits\n\n",buf->keysize); + break; + default: |