diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2016-09-29 22:21:51 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2016-09-29 22:21:51 +0000 |
| commit | f25e8b92df88c06d49030921eca49a90b4432dc2 (patch) | |
| tree | 9f8af38b99936c668af477dc9092e4ef8a64ba1b /security/nmap/files/patch-nping_Crypto.cc | |
| parent | print/harfbuzz: update to 1.3.2 (diff) | |
- update to 7.30
Changelog:
https://nmap.org/changelog.html
Notes
Notes:
svn path=/head/; revision=422952
Diffstat (limited to 'security/nmap/files/patch-nping_Crypto.cc')
| -rw-r--r-- | security/nmap/files/patch-nping_Crypto.cc | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/security/nmap/files/patch-nping_Crypto.cc b/security/nmap/files/patch-nping_Crypto.cc deleted file mode 100644 index 1094a929eb16..000000000000 --- a/security/nmap/files/patch-nping_Crypto.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- nping/Crypto.cc.orig 2016-08-01 09:34:56 UTC -+++ nping/Crypto.cc -@@ -178,7 +178,7 @@ int Crypto::aes128_cbc_encrypt(u8 *inbuf - #ifdef HAVE_OPENSSL - if( o.doCrypto() ){ - int flen=0, flen2=0; -- #if OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_CIPHER_CTX ctx; - EVP_CIPHER_CTX_init(&ctx); - EVP_CIPHER_CTX_set_padding(&ctx, 0); -@@ -231,7 +231,7 @@ int Crypto::aes128_cbc_decrypt(u8 *inbuf - #ifdef HAVE_OPENSSL - if( o.doCrypto() ){ - int flen1=0, flen2=0; -- #if OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_CIPHER_CTX ctx; - EVP_CIPHER_CTX_init(&ctx); - EVP_CIPHER_CTX_set_padding(&ctx, 0); -@@ -286,7 +286,7 @@ int Crypto::aes128_cbc_decrypt(u8 *inbuf - //ERR_free_strings(); - //ERR_pop_to_mark(); - } -- #if OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_CIPHER_CTX_cleanup(&ctx); - #else - EVP_CIPHER_CTX_reset(ctx); -@@ -327,7 +327,7 @@ u8 *Crypto::deriveKey(const u8 *from, si - static u8 hash[MAX(SHA256_HASH_LEN, EVP_MAX_MD_SIZE)]; - static u8 next[MAX(SHA256_HASH_LEN, EVP_MAX_MD_SIZE)]; - unsigned int lastlen; -- #if OPENSSL_VERSION_NUMBER < 0x10100000L -+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - EVP_MD_CTX ctx; - EVP_MD_CTX_init(&ctx); - |