Date: Wed, 7 Nov 2018 20:15:21 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484407 - head/mail/libdomainkeys/files Message-ID: <201811072015.wA7KFLx4000822@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Nov 7 20:15:21 2018 New Revision: 484407 URL: https://svnweb.freebsd.org/changeset/ports/484407 Log: mail/libdomainkeys: Correct OPENSSL_VERSION_NUMBER For the sake posterity use OpenSSL 1.1.0-pre1's version which is when EVP_MD_CTX was made opaque [1]. This should have no practical impact on the build with any of the OpenSSL versions we support. [1] https://github.com/openssl/openssl/commit/7638370ca6cb Reported by: danfe, jbeich Modified: head/mail/libdomainkeys/files/patch-domainkeys.c Modified: head/mail/libdomainkeys/files/patch-domainkeys.c ============================================================================== --- head/mail/libdomainkeys/files/patch-domainkeys.c Wed Nov 7 19:40:59 2018 (r484406) +++ head/mail/libdomainkeys/files/patch-domainkeys.c Wed Nov 7 20:15:21 2018 (r484407) @@ -7,7 +7,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git { /* STARTPRIV */ int dkmarker; /* in case somebody casts in */ -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_MD_CTX mdctx; /* the hash */ +#else + EVP_MD_CTX *mdctx; /* the hash */ @@ -20,7 +20,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git } dk->canon = canon; /* TC13-simple, TC13-nofws */ - EVP_SignInit(&dk->mdctx, dklib->md); -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L + if (!EVP_SignInit(&dk->mdctx, dklib->md)) { + if (statp) + { @@ -46,7 +46,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git return NULL; } - EVP_VerifyInit(&dk->mdctx, dklib->md); -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L + if (!EVP_VerifyInit(&dk->mdctx, dklib->md)) { + if (statp) + { @@ -71,7 +71,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git { #ifndef DK_HASH_BUFF -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, "\r\n", 2); #else + EVP_DigestUpdate(dk->mdctx, "\r\n", 2); @@ -82,7 +82,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git dk->hash_buff[dk->hash_buff_len++] = '\n'; if (dk->hash_buff_len >= (DK_BLOCK - 1)) { -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len); +#else + EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len); @@ -94,7 +94,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git if (dk->canon == DK_CANON_SIMPLE)//if nofws we ignore \r { #ifndef DK_HASH_BUFF -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, "\r", 1); #else + EVP_DigestUpdate(dk->mdctx, "\r", 1); @@ -104,7 +104,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git dk->hash_buff[dk->hash_buff_len++] = '\r'; if (dk->hash_buff_len >= (DK_BLOCK - 1)) { -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len); +#else + EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len); @@ -116,7 +116,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git dk->state --; } #ifndef DK_HASH_BUFF -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, ptr, 1); #else + EVP_DigestUpdate(dk->mdctx, ptr, 1); @@ -126,7 +126,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git dk->hash_buff[dk->hash_buff_len++] = *ptr; if (dk->hash_buff_len >= (DK_BLOCK - 1)) { -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len); +#else + EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len); @@ -138,14 +138,14 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git //clean out hash buffer dk->hash_buff[dk->hash_buff_len++] = '\r'; dk->hash_buff[dk->hash_buff_len++] = '\n'; -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len); +#else + EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len); +#endif dk->hash_buff_len = 0; #else -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_DigestUpdate(&dk->mdctx, "\r\n", 2); +#else + EVP_DigestUpdate(dk->mdctx, "\r\n", 2); @@ -158,7 +158,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git } /* using that key, verify that the digest is properly signed */ -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L i = EVP_VerifyFinal(&dk->mdctx, md_value, md_len, publickey); +#else + i = EVP_VerifyFinal(dk->mdctx, md_value, md_len, publickey); @@ -170,7 +170,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git siglen = EVP_PKEY_size(pkey); sig = (unsigned char*) OPENSSL_malloc(siglen); -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_SignFinal(&dk->mdctx, sig, &siglen, pkey); +#else + EVP_SignFinal(dk->mdctx, sig, &siglen, pkey); @@ -182,7 +182,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git #ifdef DK_HASH_BUFF DK_MFREE(dk->hash_buff); #endif -+#if OPENSSL_VERSION_NUMBER < 0x1010000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100001L EVP_MD_CTX_cleanup(&dk->mdctx); +#else + EVP_MD_CTX_free(dk->mdctx);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811072015.wA7KFLx4000822>