aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/d1_enc.c
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-03-13 19:22:41 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-03-13 19:22:41 +0000
commit6a599222bb564010b80b78eef3f2b6ba6c8db14a (patch)
tree909a7c21b7df72ae8c08b80b468a4dd75b3820be /crypto/openssl/ssl/d1_enc.c
parentc5af82e51782b019d13e562a07c17dc19a282de2 (diff)
parentf7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff)
downloadsrc-6a599222bb564010b80b78eef3f2b6ba6c8db14a.tar.gz
src-6a599222bb564010b80b78eef3f2b6ba6c8db14a.zip
Merge OpenSSL 0.9.8m into head.
This also "reverts" some FreeBSD local changes so we should now be back to using entirely stock OpenSSL. The local changes were simple $FreeBSD$ lines additions, which were required in the CVS days, and the patch for FreeBSD-SA-09:15.ssl which has been superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation extension' support. MFC after: 3 weeks
Notes
Notes: svn path=/head/; revision=205128
Diffstat (limited to 'crypto/openssl/ssl/d1_enc.c')
-rw-r--r--crypto/openssl/ssl/d1_enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/d1_enc.c b/crypto/openssl/ssl/d1_enc.c
index cf3332e4e43d..3dfa5adba3f9 100644
--- a/crypto/openssl/ssl/d1_enc.c
+++ b/crypto/openssl/ssl/d1_enc.c
@@ -151,7 +151,7 @@ int dtls1_enc(SSL *s, int send)
__FILE__, __LINE__);
else if ( EVP_CIPHER_block_size(ds->cipher) > 1)
{
- if (!RAND_bytes(rec->input, EVP_CIPHER_block_size(ds->cipher)))
+ if (RAND_bytes(rec->input, EVP_CIPHER_block_size(ds->cipher)) <= 0)
return -1;
}
}