diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-01-12 17:41:26 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-01-12 17:44:21 +0100 |
| commit | 807698db025f489dd7894f1195e4983be632bee2 (patch) | |
| tree | 8ee8d3a554fa3f88f09265ced10a39505c1c41e7 /lib/vtls/openssl.c | |
| parent | a18db792624a677221d895f4662a06b5016e4eee (diff) | |
rand: make it work without TLS backing
Regression introduced in commit f682156a4fc6c4
Reported-by: John Kohl
Bug: https://curl.haxx.se/mail/lib-2017-01/0055.html
Diffstat (limited to 'lib/vtls/openssl.c')
| -rw-r--r-- | lib/vtls/openssl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index df8f11f34..63fad71fc 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -3272,21 +3272,21 @@ size_t Curl_ossl_version(char *buffer, size_t size) } /* can be called with data == NULL */ -int Curl_ossl_random(struct Curl_easy *data, unsigned char *entropy, - size_t length) +CURLcode Curl_ossl_random(struct Curl_easy *data, unsigned char *entropy, + size_t length) { int rc; if(data) { if(Curl_ossl_seed(data)) /* Initiate the seed if not already done */ - return 1; /* couldn't seed for some reason */ + return CURLE_FAILED_INIT; /* couldn't seed for some reason */ } else { if(!rand_enough()) - return 1; + return CURLE_FAILED_INIT; } /* RAND_bytes() returns 1 on success, 0 otherwise. */ rc = RAND_bytes(entropy, curlx_uztosi(length)); - return rc^1; + return rc?CURLE_FAILED_INIT:CURLE_OK; } void Curl_ossl_md5sum(unsigned char *tmp, /* input */ |