kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.0.1h.

Browse source 
Approved by:	so (ports-security@ blanket)
Security:	5ac53801-ec2e-11e3-9cf3-3c970e169bc2
This commit is contained in:
Xin LI 2014-06-05 12:54:40 +00:00
parent 5e28364767
commit 9fafdf3747
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=356632
3 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/openssl/Makefile
View file

@ -3,8 +3,8 @@
PORTNAME= openssl
PORTVERSION= 1.0.1
DISTVERSIONSUFFIX= g
PORTREVISION= 12
DISTVERSIONSUFFIX= h
PORTREVISION= 13
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
ftp://ftp.openssl.org/%SUBDIR%/ \

20
security/openssl/distinfo
View file

@ -1,10 +1,10 @@
SHA256 (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028
SIZE (openssl-1.0.1g/openssl-1.0.1g.tar.gz) = 4509047
SHA256 (openssl-1.0.1g/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
SIZE (openssl-1.0.1g/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
SHA256 (openssl-1.0.1g/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696
SIZE (openssl-1.0.1g/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867
SHA256 (openssl-1.0.1g/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b
SIZE (openssl-1.0.1g/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625
SHA256 (openssl-1.0.1g/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
SIZE (openssl-1.0.1g/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777
SHA256 (openssl-1.0.1h/openssl-1.0.1h.tar.gz) = 9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093
SIZE (openssl-1.0.1h/openssl-1.0.1h.tar.gz) = 4475692
SHA256 (openssl-1.0.1h/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae
SIZE (openssl-1.0.1h/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512
SHA256 (openssl-1.0.1h/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696
SIZE (openssl-1.0.1h/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867
SHA256 (openssl-1.0.1h/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b
SIZE (openssl-1.0.1h/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625
SHA256 (openssl-1.0.1h/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f
SIZE (openssl-1.0.1h/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777

22
security/openssl/files/patch-ssl-s3_pkt.c
View file

@ -1,22 +0,0 @@
--- ssl/s3_pkt.c.orig 2014-03-17 17:14:20.000000000 +0100
+++ ssl/s3_pkt.c 2014-05-03 18:07:28.000000000 +0200
@@ -657,6 +657,10 @@
if (i <= 0)
return(i);
/* if it went, fall through and send more stuff */
+ /* we may have released our buffer, so get it again */
+ if (wb->buf == NULL)
+ if (!ssl3_setup_write_buffer(s))
+ return -1;
}
if (len == 0 && !create_empty_fragment)
@@ -1055,7 +1059,7 @@
{
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);
}
}