pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/sign Try to catch up with OpenSSL 0.9.8 API.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42a4d282bb4b
branches:  trunk
changeset: 506622:42a4d282bb4b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 20 00:21:27 2006 +0000

description:
Try to catch up with OpenSSL 0.9.8 API.

diffstat:

 security/sign/distinfo         |   3 ++-
 security/sign/patches/patch-aa |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r aa32d7b65112 -r 42a4d282bb4b security/sign/distinfo
--- a/security/sign/distinfo    Thu Jan 19 23:58:28 2006 +0000
+++ b/security/sign/distinfo    Fri Jan 20 00:21:27 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/20 00:21:27 joerg Exp $
 
 SHA1 (sign-1.0.4.tar.gz) = 33bd6f6cc19c429ea90ca63206e5c5afb93e0a11
 RMD160 (sign-1.0.4.tar.gz) = c831f54538d0c21527a30546c919c3b68810cd0d
 Size (sign-1.0.4.tar.gz) = 28403 bytes
+SHA1 (patch-aa) = a3c15f38430119ec65f811df18778298e216a6e2
diff -r aa32d7b65112 -r 42a4d282bb4b security/sign/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/sign/patches/patch-aa    Fri Jan 20 00:21:27 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2006/01/20 00:21:27 joerg Exp $
+
+--- src/pki.c.orig     2006-01-20 00:13:14.000000000 +0000
++++ src/pki.c
+@@ -285,10 +285,17 @@ prikey_t * prikey_parse_pem(const buf_t 
+                       break;
+ 
+               /* if it's not a decryption problem - bail out */
++#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++              if (ERR_get_error() != ERR_PACK(ERR_LIB_EVP,
++                                              EVP_F_EVP_DECRYPTFINAL_EX,
++                                              EVP_R_BAD_DECRYPT))
++                      goto cleanup;
++#else
+               if (ERR_get_error() != ERR_PACK(ERR_LIB_EVP,
+                                               EVP_F_EVP_DECRYPTFINAL,
+                                               EVP_R_BAD_DECRYPT))
+                       goto cleanup;
++#endif
+ 
+               /* rewind bio stuff */
+               mem = (BUF_MEM*)bio->ptr;



Home | Main Index | Thread Index | Old Index