CVS commit: pkgsrc/security/cyrus-sasl

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Wed Jul 25 01:16:04 UTC 2018

Modified Files:
        pkgsrc/security/cyrus-sasl: distinfo
Added Files:
        pkgsrc/security/cyrus-sasl/patches: patch-common_crypto-compat

Log Message:
Build with OpenSSL < 1.1.0 that was patched to include EVP_CIPHER_CTX_iv


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/cyrus-sasl/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/cyrus-sasl/patches/patch-common_crypto-compat

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/cyrus-sasl/distinfo
diff -u pkgsrc/security/cyrus-sasl/distinfo:1.35 pkgsrc/security/cyrus-sasl/distinfo:1.36
--- pkgsrc/security/cyrus-sasl/distinfo:1.35    Tue Apr 17 01:57:17 2018
+++ pkgsrc/security/cyrus-sasl/distinfo Wed Jul 25 01:16:04 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2018/04/17 01:57:17 christos Exp $
+$NetBSD: distinfo,v 1.36 2018/07/25 01:16:04 manu Exp $
 
 SHA1 (cyrus-sasl-2.1.27-rc7.tar.gz) = d4b72782975be980cc46ac9ccf176b8307bfcf67
 RMD160 (cyrus-sasl-2.1.27-rc7.tar.gz) = 6679c7b887f73da50a314dba97f676848d067684
@@ -8,6 +8,7 @@ SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5
 RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = c42b1b5c0b6c7322001fd506c44320a7f6eeee80
 SHA512 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 
08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744
 Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 3836 bytes
+SHA1 (patch-common_crypto-compat) = ad8575c62648aba83983172ec8fef08d2c9f537e
 SHA1 (patch-configure) = 1afa4777f2cc2a24bb526fab9fb6d9265677fb9f
 SHA1 (patch-plugins_otp.c) = 1dd8763d5b14c2f2462349ce5f73353ae70313fa
 SHA1 (patch-saslauthd_Makefile.in) = 397bc893975ff4d8b0067dae571381f06486493d

Added files:

Index: pkgsrc/security/cyrus-sasl/patches/patch-common_crypto-compat
diff -u /dev/null pkgsrc/security/cyrus-sasl/patches/patch-common_crypto-compat:1.1
--- /dev/null   Wed Jul 25 01:16:04 2018
+++ pkgsrc/security/cyrus-sasl/patches/patch-common_crypto-compat       Wed Jul 25 01:16:04 2018
@@ -0,0 +1,41 @@
+$NetBSD: patch-common_crypto-compat,v 1.1 2018/07/25 01:16:04 manu Exp $
+
+Build with OpenSSL < 1.1.0 that was patched to include EVP_CIPHER_CTX_iv
+
+--- common/crypto-compat.h.orig        2018-07-25 01:04:30.167508411 +0000
++++ common/crypto-compat.h     2018-07-25 01:05:02.861593517 +0000
+@@ -39,10 +39,12 @@
+ void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key);
+ int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
+ int DH_set_length(DH *dh, long length);
+ 
++#ifndef EVP_CIPHER_CTX_iv
+ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx);
+ unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx);
++#endif /* EVP_CIPHER_CTX_iv */
+ EVP_MD_CTX *EVP_MD_CTX_new(void);
+ void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
+ EVP_ENCODE_CTX *EVP_ENCODE_CTX_new(void);
+ void EVP_ENCODE_CTX_free(EVP_ENCODE_CTX *ctx);
+--- common/crypto-compat.c.orig        2018-07-25 01:04:22.770573257 +0000
++++ common/crypto-compat.c     2018-07-25 01:04:51.178733049 +0000
+@@ -306,8 +306,9 @@
+     dh->length = length;
+     return 1;
+ }
+ 
++#ifndef EVP_CIPHER_CTX_iv
+ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx)
+ {
+     return ctx->iv;
+ }
+@@ -315,8 +316,9 @@
+ unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx)
+ {
+     return ctx->iv;
+ }
++#endif /* EVP_CIPHER_CTX_iv */
+ 
+ EVP_MD_CTX *EVP_MD_CTX_new(void)
+ {
+     return OPENSSL_zalloc(sizeof(EVP_MD_CTX));