diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-06-05 16:36:25 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-06-05 16:36:25 -0400 |
| commit | 017f7415ab6eba71448215fe9bb133262680ff09 (patch) | |
| tree | 7f02e9a7c63420b2bfe60ca10d8ce5fe51221d47 /gnu/packages/patches/openssl-CVE-2010-5298.patch | |
| parent | cc24623d7189ec03a2b31750daf784b06474cb84 (diff) | |
| download | guix-017f7415ab6eba71448215fe9bb133262680ff09.tar.gz | |
gnu: openssl: Upgrade to 1.0.1h.
* gnu/packages/openssl.scm (openssl): Upgrade to 1.0.1h. Remove patches, which are now upstream. * gnu/packages/patches/openssl-extension-checking-fixes.patch: Remove. * gnu/packages/patches/openssl-CVE-2010-5298.patch: Remove. * gnu-system.am (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/openssl-CVE-2010-5298.patch')
| -rw-r--r-- | gnu/packages/patches/openssl-CVE-2010-5298.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gnu/packages/patches/openssl-CVE-2010-5298.patch b/gnu/packages/patches/openssl-CVE-2010-5298.patch deleted file mode 100644 index 707a24dff0..0000000000 --- a/gnu/packages/patches/openssl-CVE-2010-5298.patch +++ /dev/null @@ -1,27 +0,0 @@ -From db978be7388852059cf54e42539a363d549c5bfd Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt@roeckx.be> -Date: Sun, 13 Apr 2014 15:05:30 +0200 -Subject: [PATCH] Don't release the buffer when there still is data in it - -RT: 2167, 3265 ---- - ssl/s3_pkt.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c -index b9e45c7..32e9207 100644 ---- a/ssl/s3_pkt.c -+++ b/ssl/s3_pkt.c -@@ -1055,7 +1055,8 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) - { - s->rstate=SSL_ST_READ_HEADER; - rr->off=0; -- if (s->mode & SSL_MODE_RELEASE_BUFFERS) -+ if (s->mode & SSL_MODE_RELEASE_BUFFERS && -+ s->s3->rbuf.left == 0) - ssl3_release_read_buffer(s); - } - } --- -1.9.1 - |