diff options
author | joerg <joerg@pkgsrc.org> | 2006-01-20 00:21:27 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-01-20 00:21:27 +0000 |
commit | f6dc7985490b0d20122032e7aa8d774c745ccd5b (patch) | |
tree | 6d09709b907ce2504d8fe6d1b4e7b407a198882d /security | |
parent | ed68fd5c17297f9dde2e35edfe0b64b17723d393 (diff) | |
download | pkgsrc-f6dc7985490b0d20122032e7aa8d774c745ccd5b.tar.gz |
Try to catch up with OpenSSL 0.9.8 API.
Diffstat (limited to 'security')
-rw-r--r-- | security/sign/distinfo | 3 | ||||
-rw-r--r-- | security/sign/patches/patch-aa | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/security/sign/distinfo b/security/sign/distinfo index 04caca1e7bf..f4d1fcd0535 100644 --- a/security/sign/distinfo +++ b/security/sign/distinfo @@ -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 --git a/security/sign/patches/patch-aa b/security/sign/patches/patch-aa new file mode 100644 index 00000000000..1bbbdf2b993 --- /dev/null +++ b/security/sign/patches/patch-aa @@ -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; |