aboutsummaryrefslogtreecommitdiff
path: root/lib/vtls/nss.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-01-12 17:41:26 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-01-12 17:44:21 +0100
commit807698db025f489dd7894f1195e4983be632bee2 (patch)
tree8ee8d3a554fa3f88f09265ced10a39505c1c41e7 /lib/vtls/nss.c
parenta18db792624a677221d895f4662a06b5016e4eee (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/nss.c')
-rw-r--r--lib/vtls/nss.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index ba8d58260..a450703aa 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.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
@@ -2138,17 +2138,17 @@ int Curl_nss_seed(struct Curl_easy *data)
}
/* data might be NULL */
-int Curl_nss_random(struct Curl_easy *data,
- unsigned char *entropy,
- size_t length)
+CURLcode Curl_nss_random(struct Curl_easy *data,
+ unsigned char *entropy,
+ size_t length)
{
Curl_nss_seed(data); /* Initiate the seed if not already done */
if(SECSuccess != PK11_GenerateRandom(entropy, curlx_uztosi(length)))
/* signal a failure */
- return -1;
+ return CURLE_FAILED_INIT;
- return 0;
+ return CURLE_OK;
}
void Curl_nss_md5sum(unsigned char *tmp, /* input */