From 6130918d78ef6a14914b7dacd66ceeab76244e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Wed, 4 May 2016 13:05:01 +0300 Subject: [PATCH] Updated to 1.0.1t --- .abf.yml | 3 ++- openssl-1.0.0d-CVE-2012-2333.diff | 15 --------------- openssl-1.0.1s.tar.gz.asc | 11 ----------- openssl.spec | 7 +++---- 4 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 openssl-1.0.0d-CVE-2012-2333.diff delete mode 100644 openssl-1.0.1s.tar.gz.asc diff --git a/.abf.yml b/.abf.yml index 7cbeb5e..546e214 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: - openssl-1.0.1s.tar.gz: d027e1a00c26da7fede7d537d5c7718c3cdb4653 + openssl-1.0.1t.tar.gz: a684ba59d6721a90f354b1953e19611646be7e7d + openssl-1.0.1t.tar.gz.asc: 66e5414fde8a1947a125f723a6732cbcba113b8d diff --git a/openssl-1.0.0d-CVE-2012-2333.diff b/openssl-1.0.0d-CVE-2012-2333.diff deleted file mode 100644 index 73a7a9c..0000000 --- a/openssl-1.0.0d-CVE-2012-2333.diff +++ /dev/null @@ -1,15 +0,0 @@ - -http://cvs.openssl.org/chngview?cn=22547 -http://openssl.org/news/secadv_20120510.txt - ---- ssl/d1_enc.c 2011-01-04 19:33:22.000000000 +0000 -+++ ssl/d1_enc.c.oden 2012-05-11 09:49:13.000000000 +0000 -@@ -260,7 +260,7 @@ int dtls1_enc(SSL *s, int send) - } - /* TLS 1.0 does not bound the number of padding bytes by the block size. - * All of them must have value 'padding_length'. */ -- if (i > (int)rec->length) -+ if (i + bs > (int)rec->length) - { - /* Incorrect padding. SSLerr() and ssl3_alert are done - * by caller: we don't want to reveal whether this is diff --git a/openssl-1.0.1s.tar.gz.asc b/openssl-1.0.1s.tar.gz.asc deleted file mode 100644 index 2644d55..0000000 --- a/openssl-1.0.1s.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJW1ZviAAoJENnE0m0OYESR8E8IAIqgweGM6WOVsXp6qcKo1MLK -JiMHDIx/5ER2dDx/1H4qDAO+APetmcG11n3U9SGajgIXCS2+QL0pLC8r8DPqeTtt -S7fOM8fxBPa8A2ZKC2blNdfpd+A4vXCW2S+/5QXyh3cm6yItzeehCgFyLMbxLOmy -6xame0cVr7R9MRlaAqwVKKOyDYoF9qXAN6jkE68si4TS7m+O2gU0aOiLmkuFM+K6 -WDJ7m+rN9UGGS2gp23FjMTOZt2pxyPqqX2LDsk+xFw0YgmZ81vnOiFTx9c8+fdS9 -jjCsoo4H0asiP7lEMLfX/wS7t+SxWf1SEQ+YT5tUqO3SdaAcSH8VeufdSG2tcnc= -=AnuU ------END PGP SIGNATURE----- diff --git a/openssl.spec b/openssl.spec index 2b716ff..dcbb6f3 100644 --- a/openssl.spec +++ b/openssl.spec @@ -14,11 +14,11 @@ Summary: Secure Sockets Layer communications libs & utils Name: openssl -Version: 1.0.1s -Release: 2 +Version: 1.0.1t +Release: 1 License: BSD-like Group: System/Libraries -Url: http://www.openssl.org/ +Url: https://www.openssl.org Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz Source1: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz.asc Source2: Makefile.certificate @@ -322,4 +322,3 @@ popd perl -pi -e "s|^CATOP=.*|CATOP=%{_sysconfdir}/pki/tls|g" %{buildroot}%{_sysconfdir}/pki/tls/misc/CA perl -pi -e "s|^\\\$CATOP\=\".*|\\\$CATOP\=\"%{_sysconfdir}/pki/tls\";|g" %{buildroot}%{_sysconfdir}/pki/tls/misc/CA.pl perl -pi -e "s|\./demoCA|%{_sysconfdir}/pki/tls|g" %{buildroot}%{_sysconfdir}/pki/tls/openssl.cnf -