aboutsummaryrefslogtreecommitdiff
path: root/lib/vtls/nssg.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2014-06-03 20:04:46 +0200
committerDaniel Stenberg <daniel@haxx.se>2014-07-30 00:05:47 +0200
commit8dfd22089cac13f718815eb60581ad392b7f106e (patch)
treec03f2cb748342b44dda4b0b99df3a3d6f5f50492 /lib/vtls/nssg.h
parent37faf55e170ecaa06846d0c9a1a37b6bed39ae57 (diff)
vtls: make the random function mandatory in the TLS backend
To force each backend implementation to really attempt to provide proper random. If a proper random function is missing, then we can explicitly make use of the default one we use when TLS support is missing. This commit makes sure it works for darwinssl, gnutls, nss and openssl.
Diffstat (limited to 'lib/vtls/nssg.h')
-rw-r--r--lib/vtls/nssg.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/vtls/nssg.h b/lib/vtls/nssg.h
index 21e96ce4b..d441de9d9 100644
--- a/lib/vtls/nssg.h
+++ b/lib/vtls/nssg.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, 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
@@ -51,9 +51,9 @@ int Curl_nss_seed(struct SessionHandle *data);
/* initialize NSS library if not already */
CURLcode Curl_nss_force_init(struct SessionHandle *data);
-void Curl_nss_random(struct SessionHandle *data,
- unsigned char *entropy,
- size_t length);
+int Curl_nss_random(struct SessionHandle *data,
+ unsigned char *entropy,
+ size_t length);
void Curl_nss_md5sum(unsigned char *tmp, /* input */
size_t tmplen,
@@ -61,7 +61,6 @@ void Curl_nss_md5sum(unsigned char *tmp, /* input */
size_t md5len);
/* this backend provides these functions: */
-#define have_curlssl_random 1
#define have_curlssl_md5sum 1
/* API setup for NSS */