diff options
| author | tedu <> | 2014-05-29 21:25:16 +0000 |
|---|---|---|
| committer | tedu <> | 2014-05-29 21:25:16 +0000 |
| commit | 64d373b6ae028106d649effce02b22eaf8c289e2 (patch) | |
| tree | bef14a8459c9309aff1406cd6ef5c65f817b3530 /src | |
| parent | fffc6c93172d4ff19cc5fe27dd6fcbc29a5c7224 (diff) | |
| download | openbsd-64d373b6ae028106d649effce02b22eaf8c289e2.tar.gz openbsd-64d373b6ae028106d649effce02b22eaf8c289e2.tar.bz2 openbsd-64d373b6ae028106d649effce02b22eaf8c289e2.zip | |
the comment says RAND_pseudo_bytes should be RAND_bytes. make it so.
ok deraadt
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/s3_srvr.c | 7 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/s3_srvr.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index b53f27a47d..481cf37bef 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c | |||
| @@ -2137,12 +2137,7 @@ ssl3_get_client_key_exchange(SSL *s) | |||
| 2137 | i = SSL_MAX_MASTER_KEY_LENGTH; | 2137 | i = SSL_MAX_MASTER_KEY_LENGTH; |
| 2138 | p[0] = s->client_version >> 8; | 2138 | p[0] = s->client_version >> 8; |
| 2139 | p[1] = s->client_version & 0xff; | 2139 | p[1] = s->client_version & 0xff; |
| 2140 | /* | 2140 | RAND_bytes(p+2, i-2); |
| 2141 | * Should be RAND_bytes, but we cannot work around a | ||
| 2142 | * failure. | ||
| 2143 | */ | ||
| 2144 | if (RAND_pseudo_bytes(p+2, i-2) <= 0) | ||
| 2145 | goto err; | ||
| 2146 | } | 2141 | } |
| 2147 | 2142 | ||
| 2148 | s->session->master_key_length = | 2143 | s->session->master_key_length = |
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c index b53f27a47d..481cf37bef 100644 --- a/src/lib/libssl/src/ssl/s3_srvr.c +++ b/src/lib/libssl/src/ssl/s3_srvr.c | |||
| @@ -2137,12 +2137,7 @@ ssl3_get_client_key_exchange(SSL *s) | |||
| 2137 | i = SSL_MAX_MASTER_KEY_LENGTH; | 2137 | i = SSL_MAX_MASTER_KEY_LENGTH; |
| 2138 | p[0] = s->client_version >> 8; | 2138 | p[0] = s->client_version >> 8; |
| 2139 | p[1] = s->client_version & 0xff; | 2139 | p[1] = s->client_version & 0xff; |
| 2140 | /* | 2140 | RAND_bytes(p+2, i-2); |
| 2141 | * Should be RAND_bytes, but we cannot work around a | ||
| 2142 | * failure. | ||
| 2143 | */ | ||
| 2144 | if (RAND_pseudo_bytes(p+2, i-2) <= 0) | ||
| 2145 | goto err; | ||
| 2146 | } | 2141 | } |
| 2147 | 2142 | ||
| 2148 | s->session->master_key_length = | 2143 | s->session->master_key_length = |