diff options
Diffstat (limited to 'testing/proftpd/libressl.patch')
-rw-r--r-- | testing/proftpd/libressl.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/testing/proftpd/libressl.patch b/testing/proftpd/libressl.patch new file mode 100644 index 0000000000..60b0ef8004 --- /dev/null +++ b/testing/proftpd/libressl.patch @@ -0,0 +1,56 @@ +--- a/contrib/mod_sftp/kex.c ++++ b/contrib/mod_sftp/kex.c +@@ -3778,7 +3778,7 @@ + const unsigned char *hostkey_data, uint32_t hostkey_datalen, + const BIGNUM *k, unsigned char *client_curve25519, + unsigned char *server_curve25519, uint32_t *hlen) { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL) + EVP_MD_CTX ctx; + #endif /* prior to OpenSSL-1.1.0 */ + EVP_MD_CTX *pctx; +@@ -3822,7 +3822,7 @@ + /* Shared secret */ + sftp_msg_write_mpint(&buf, &buflen, k); + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000LL ++#if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL) + pctx = EVP_MD_CTX_new(); + #else + pctx = &ctx; +@@ -3840,7 +3840,7 @@ + BN_clear_free(kex->e); + kex->e = NULL; + pr_memscrub(ptr, bufsz); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000LL ++# if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL) + EVP_MD_CTX_free(pctx); + # endif /* OpenSSL-1.1.0 and later */ + return NULL; +@@ -3856,7 +3856,7 @@ + BN_clear_free(kex->e); + kex->e = NULL; + pr_memscrub(ptr, bufsz); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000LL ++# if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL) + EVP_MD_CTX_free(pctx); + # endif /* OpenSSL-1.1.0 and later */ + return NULL; +@@ -3872,7 +3872,7 @@ + BN_clear_free(kex->e); + kex->e = NULL; + pr_memscrub(ptr, bufsz); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000LL ++# if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL) + EVP_MD_CTX_free(pctx); + # endif /* OpenSSL-1.1.0 and later */ + return NULL; +@@ -3881,7 +3881,7 @@ + EVP_DigestFinal(pctx, kex_digest_buf, hlen); + #endif + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000LL ++#if OPENSSL_VERSION_NUMBER >= 0x10100000LL && !defined(HAVE_LIBRESSL) + EVP_MD_CTX_free(pctx); + #endif /* OpenSSL-1.1.0 and later */ + BN_clear_free(kex->e); |