Fri Sep 19 19:47:07 2008 UTC ()
Catch up with OpenSSL interface changes.


(joerg)
diff -r1.29 -r1.30 pkgsrc/mail/cue/distinfo
diff -r1.4 -r1.5 pkgsrc/mail/cue/patches/patch-ab
diff -r0 -r1.1 pkgsrc/mail/cue/patches/patch-ae
cvs diff -r1.29 -r1.30 pkgsrc/mail/cue/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/cue/distinfo 2008/05/02 03:55:38 1.29
+++ pkgsrc/mail/cue/distinfo 2008/09/19 19:47:07 1.30
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.29 2008/05/02 03:55:38 obache Exp $ 1$NetBSD: distinfo,v 1.30 2008/09/19 19:47:07 joerg Exp $
2 2
3SHA1 (cue-snap-20080211.tar.gz) = 4f1e25f0ec6bfebe08393f424719f15e19322785 3SHA1 (cue-snap-20080211.tar.gz) = 4f1e25f0ec6bfebe08393f424719f15e19322785
4RMD160 (cue-snap-20080211.tar.gz) = 7c138089a34c8bef88a408402ac01741ebe1748f 4RMD160 (cue-snap-20080211.tar.gz) = 7c138089a34c8bef88a408402ac01741ebe1748f
5Size (cue-snap-20080211.tar.gz) = 228255 bytes 5Size (cue-snap-20080211.tar.gz) = 228255 bytes
6SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04 6SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04
7SHA1 (patch-ab) = a94ec3a565bbde8e8ca064821867f7a978450687 7SHA1 (patch-ab) = 1c7415aaf56d1552624293e6e3ee3c32eb66300b
8SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936 8SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936
9SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65 9SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65
 10SHA1 (patch-ae) = ec38b968d6439ad5038d5f2df12a2785c0572653
cvs diff -r1.4 -r1.5 pkgsrc/mail/cue/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/mail/cue/patches/Attic/patch-ab 2006/10/07 08:19:08 1.4
+++ pkgsrc/mail/cue/patches/Attic/patch-ab 2008/09/19 19:47:07 1.5
@@ -1,12 +1,36 @@ @@ -1,12 +1,36 @@
1$NetBSD: patch-ab,v 1.4 2006/10/07 08:19:08 obache Exp $ 1$NetBSD: patch-ab,v 1.5 2008/09/19 19:47:07 joerg Exp $
2 2
3--- pgp.c.orig 2006-03-27 16:24:40.000000000 +0900 3--- pgp.c.orig 2007-06-11 19:40:21.000000000 +0200
4+++ pgp.c 4+++ pgp.c
5@@ -37,6 +37,7 @@ 5@@ -37,6 +37,7 @@
6  6
7 #ifdef OPENSSL 7 #ifdef OPENSSL
8 #include <openssl/bn.h> 8 #include <openssl/bn.h>
9+#include <openssl/dsa.h> 9+#include <openssl/dsa.h>
10 #include <openssl/rsa.h> 10 #include <openssl/rsa.h>
11 #include <openssl/evp.h> 11 #include <openssl/evp.h>
12 #include <openssl/rand.h> 12 #include <openssl/rand.h>
 13@@ -987,7 +988,11 @@ pgp_decrypt_seskey(struct pgp_pkt *pkt,
 14 return -1;
 15 if ((buf = malloc(len)) == NULL)
 16 return -1;
 17+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
 18+ len = EVP_PKEY_decrypt_old(buf, p, len, seckey->un.pubkey.key);
 19+#else
 20 len = EVP_PKEY_decrypt(buf, p, len, seckey->un.pubkey.key);
 21+#endif
 22 break;
 23 case PGP_PUB_ELGAMAL_ENC:
 24 {
 25@@ -1073,7 +1078,11 @@ pgp_encrypt_seskey(struct pgp_pkt *pkt,
 26 case PGP_PUB_RSA:
 27 if ((buf = malloc(EVP_PKEY_size(pubkey->un.pubkey.key) + 2)) == NULL)
 28 break;
 29+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
 30+ len = EVP_PKEY_encrypt_old(buf + 2, pkt->un.pubses.seskey, pkt->un.pubses.seslen, pubkey->un.pubkey.key);
 31+#else
 32 len = EVP_PKEY_encrypt(buf + 2, pkt->un.pubses.seskey, pkt->un.pubses.seslen, pubkey->un.pubkey.key);
 33+#endif
 34 n = BN_bin2bn(buf + 2, len, NULL);
 35 i = BN_num_bits(n);
 36 BN_free(n);
File Added: pkgsrc/mail/cue/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.1 2008/09/19 19:47:07 joerg Exp $

--- smime.c.orig	2007-06-11 19:40:21.000000000 +0200
+++ smime.c
@@ -41,6 +41,7 @@
 #include <openssl/pem.h>
 #include <openssl/pkcs7.h>
 #include <openssl/rand.h>
+#include <openssl/opensslv.h>
 #else /* OPENSSL */
 #include <asn1.h>
 #include <err.h>
@@ -1003,7 +1004,11 @@ smime_encrypt(struct state *state)
 				buf = q;
 				buflen = len;
 			}
+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+			len = EVP_PKEY_encrypt_old(buf, key, keylen, pkey);
+#else
 			len = EVP_PKEY_encrypt(buf, key, keylen, pkey);
+#endif
 			ASN1_OCTET_STRING_set(ri->enc_key, buf, len);
 		}
 		if (buf)