[pkgsrc/trunk]: pkgsrc/mail/cue Catch up with OpenSSL interface changes.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/484ebf8f20f3
branches:  trunk
changeset: 547558:484ebf8f20f3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Sep 19 19:47:07 2008 +0000

description:
Catch up with OpenSSL interface changes.

diffstat:

 mail/cue/distinfo         |   5 +++--
 mail/cue/patches/patch-ab |  28 ++++++++++++++++++++++++++--
 mail/cue/patches/patch-ae |  24 ++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 4 deletions(-)

diffs (84 lines):

diff -r 73ff9d6335c2 -r 484ebf8f20f3 mail/cue/distinfo
--- a/mail/cue/distinfo Fri Sep 19 19:39:22 2008 +0000
+++ b/mail/cue/distinfo Fri Sep 19 19:47:07 2008 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.29 2008/05/02 03:55:38 obache Exp $
+$NetBSD: distinfo,v 1.30 2008/09/19 19:47:07 joerg Exp $
 
 SHA1 (cue-snap-20080211.tar.gz) = 4f1e25f0ec6bfebe08393f424719f15e19322785
 RMD160 (cue-snap-20080211.tar.gz) = 7c138089a34c8bef88a408402ac01741ebe1748f
 Size (cue-snap-20080211.tar.gz) = 228255 bytes
 SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04
-SHA1 (patch-ab) = a94ec3a565bbde8e8ca064821867f7a978450687
+SHA1 (patch-ab) = 1c7415aaf56d1552624293e6e3ee3c32eb66300b
 SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936
 SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65
+SHA1 (patch-ae) = ec38b968d6439ad5038d5f2df12a2785c0572653
diff -r 73ff9d6335c2 -r 484ebf8f20f3 mail/cue/patches/patch-ab
--- a/mail/cue/patches/patch-ab Fri Sep 19 19:39:22 2008 +0000
+++ b/mail/cue/patches/patch-ab Fri Sep 19 19:47:07 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2006/10/07 08:19:08 obache Exp $
+$NetBSD: patch-ab,v 1.5 2008/09/19 19:47:07 joerg Exp $
 
---- pgp.c.orig 2006-03-27 16:24:40.000000000 +0900
+--- pgp.c.orig 2007-06-11 19:40:21.000000000 +0200
 +++ pgp.c
 @@ -37,6 +37,7 @@
  
@@ -10,3 +10,27 @@
  #include <openssl/rsa.h>
  #include <openssl/evp.h>
  #include <openssl/rand.h>
+@@ -987,7 +988,11 @@ pgp_decrypt_seskey(struct pgp_pkt *pkt, 
+                       return -1;
+               if ((buf = malloc(len)) == NULL)
+                       return -1;
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
++              len = EVP_PKEY_decrypt_old(buf, p, len, seckey->un.pubkey.key);
++#else
+               len = EVP_PKEY_decrypt(buf, p, len, seckey->un.pubkey.key);
++#endif
+               break;
+       case PGP_PUB_ELGAMAL_ENC:
+           {
+@@ -1073,7 +1078,11 @@ pgp_encrypt_seskey(struct pgp_pkt *pkt, 
+       case PGP_PUB_RSA:
+               if ((buf = malloc(EVP_PKEY_size(pubkey->un.pubkey.key) + 2)) == NULL)
+                       break;
++#if OPENSSL_VERSION_NUMBER >= 0x00909000L
++              len = EVP_PKEY_encrypt_old(buf + 2, pkt->un.pubses.seskey, pkt->un.pubses.seslen, pubkey->un.pubkey.key);
++#else
+               len = EVP_PKEY_encrypt(buf + 2, pkt->un.pubses.seskey, pkt->un.pubses.seslen, pubkey->un.pubkey.key);
++#endif
+               n = BN_bin2bn(buf + 2, len, NULL);
+               i = BN_num_bits(n);
+               BN_free(n);
diff -r 73ff9d6335c2 -r 484ebf8f20f3 mail/cue/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cue/patches/patch-ae Fri Sep 19 19:47:07 2008 +0000
@@ -0,0 +1,24 @@
+$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)