diff options
| -rw-r--r-- | security/openssl/Makefile | 4 | ||||
| -rw-r--r-- | security/openssl/distinfo | 9 | ||||
| -rw-r--r-- | security/openssl/patches/patch-am | 13 |
3 files changed, 6 insertions, 20 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 16e46c0c0f4..99b10305755 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.137 2009/01/08 16:38:22 tnn Exp $ +# $NetBSD: Makefile,v 1.138 2009/04/05 15:50:17 tnn Exp $ OPENSSL_SNAPSHOT?= # empty OPENSSL_STABLE?= # empty -OPENSSL_VERS?= 0.9.8j +OPENSSL_VERS?= 0.9.8k .if empty(OPENSSL_SNAPSHOT) DISTNAME= openssl-${OPENSSL_VERS} diff --git a/security/openssl/distinfo b/security/openssl/distinfo index e694845d690..20ab976d615 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.65 2009/01/08 16:38:22 tnn Exp $ +$NetBSD: distinfo,v 1.66 2009/04/05 15:50:17 tnn Exp $ -SHA1 (openssl-0.9.8j.tar.gz) = f70f7127a26e951e8a0d854c0c9e6b4c24df78e4 -RMD160 (openssl-0.9.8j.tar.gz) = d60417e0fd943fbffc6dae8391a21dcf5d97e967 -Size (openssl-0.9.8j.tar.gz) = 3738359 bytes +SHA1 (openssl-0.9.8k.tar.gz) = 3ba079f91d3c1ec90a36dcd1d43857165035703f +RMD160 (openssl-0.9.8k.tar.gz) = 496df7a5d33457b0d8e3b930a8e5cf068923182c +Size (openssl-0.9.8k.tar.gz) = 3852259 bytes SHA1 (patch-aa) = b28ec662bf0586e31d59cab45e3a28b91b10dac1 SHA1 (patch-ac) = a766699f2d007b70689bbad538ede07ded7b34ff SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3 @@ -11,4 +11,3 @@ SHA1 (patch-af) = 1eda5a96835b65d325c77ce5d39f1e524815a3c7 SHA1 (patch-ag) = 5f12c72b85e4b6c6a79dfcf87055e9e029fbd8c8 SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0 SHA1 (patch-al) = 076a606352bdeaeea1cc64f16be2ac1325882302 -SHA1 (patch-am) = 72d9d776878fc4908c40aacbe4d79ba3edd0a584 diff --git a/security/openssl/patches/patch-am b/security/openssl/patches/patch-am deleted file mode 100644 index b1a763cadbb..00000000000 --- a/security/openssl/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.6 2009/01/08 16:38:22 tnn Exp $ - ---- crypto/evp/enc_min.c.orig 2008-12-02 19:14:44.000000000 +0100 -+++ crypto/evp/enc_min.c -@@ -199,7 +199,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ct - enc = 1; - ctx->encrypt = enc; - } --#ifdef OPENSSL_NO_FIPS -+#if 0 /* def OPENSSL_NO_FIPS */ - if(FIPS_selftest_failed()) - { - FIPSerr(FIPS_F_EVP_CIPHERINIT_EX,FIPS_R_FIPS_SELFTEST_FAILED); |