From f379b7e46fd246359709a7a383167fa0e410485360d99147d06540c033396024 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 23 Apr 2007 21:20:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=4 --- openssl-0.9.8-key_length.patch | 19 +++++++++++++++++++ openssl.changes | 5 +++++ openssl.spec | 6 +++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 openssl-0.9.8-key_length.patch diff --git a/openssl-0.9.8-key_length.patch b/openssl-0.9.8-key_length.patch new file mode 100644 index 0000000..1d75f93 --- /dev/null +++ b/openssl-0.9.8-key_length.patch @@ -0,0 +1,19 @@ +#254905, #262477 + +http://cvs.openssl.org/chngview?cn=15978 + +EVP_CIPHER_CTX_key_length() should return the set key length in the +EVP_CIPHER_CTX structure which may not be the same as the underlying +cipher key length for variable length ciphers. + +--- a/crypto/evp/evp_lib.c 2006/11/29 20:47:13 1.10.2.1 ++++ b/crypto/evp/evp_lib.c 2007/02/27 18:42:52 1.10.2.2 +@@ -225,7 +225,7 @@ + + int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx) + { +- return ctx->cipher->key_len; ++ return ctx->key_len; + } + + int EVP_CIPHER_nid(const EVP_CIPHER *cipher) diff --git a/openssl.changes b/openssl.changes index eb6ac67..2c9544c 100644 --- a/openssl.changes +++ b/openssl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 11:17:57 CEST 2007 - mkoenig@suse.de + +- Fix key length [#254905,#262477] + ------------------------------------------------------------------- Tue Mar 6 10:38:10 CET 2007 - mkoenig@suse.de diff --git a/openssl.spec b/openssl.spec index d9362be..a7f933c 100644 --- a/openssl.spec +++ b/openssl.spec @@ -24,7 +24,7 @@ Conflicts: ssleay Obsoletes: ssleay Autoreqprov: on Version: 0.9.8e -Release: 1 +Release: 7 Summary: Secure Sockets and Transport Layer Security URL: http://www.openssl.org/ Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 @@ -42,6 +42,7 @@ Patch9: openssl-0.9.6g-alpha.diff Patch11: openssl-s390-config.diff Patch20: openssl-0.9.8a.ca-app-segfault.bug128655.dif Patch21: bswap.diff +Patch22: openssl-0.9.8-key_length.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -129,6 +130,7 @@ Authors: %patch11 %patch20 -p1 %patch21 +%patch22 -p1 cp -p %{S:10} . cp -p %{S:20} certs/ cp -p %{S:21} certs/ @@ -334,6 +336,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %{_libdir}/engines %changelog +* Mon Apr 23 2007 - mkoenig@suse.de +- Fix key length [#254905,#262477] * Tue Mar 06 2007 - mkoenig@suse.de - update to version 0.9.8e: * patches merged upstream: