From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 21 Dec 2013 08:29:43 +0000 (+0100)
Subject: pkcs11_get_random was renamed
X-Git-Tag: gnutls_3_3_0pre0~422
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6e156f071bc130ddc024abfa72ab1a3cb493921;p=thirdparty%2Fgnutls.git

pkcs11_get_random was renamed
---

diff --git a/lib/pkcs11_int.c b/lib/pkcs11_int.c
index 23c9b65630..4359ec0fc7 100644
--- a/lib/pkcs11_int.c
+++ b/lib/pkcs11_int.c
@@ -213,7 +213,7 @@ pkcs11_set_pin(struct ck_function_list * module,
 }
 
 ck_rv_t
-pkcs11_get_random(struct ck_function_list * module,
+_gnutls_pkcs11_get_random(struct ck_function_list * module,
 		  ck_session_handle_t sess, void *data, size_t len)
 {
 	return (module)->C_GenerateRandom(sess, data, len);
diff --git a/lib/pkcs11_int.h b/lib/pkcs11_int.h
index d05a272722..a3ec1ab137 100644
--- a/lib/pkcs11_int.h
+++ b/lib/pkcs11_int.h
@@ -276,7 +276,7 @@ pkcs11_set_pin(struct ck_function_list *module,
 	       const char *new_pin, unsigned long new_len);
 
 ck_rv_t
-pkcs11_get_random(struct ck_function_list *module,
+_gnutls_pkcs11_get_random(struct ck_function_list *module,
 		  ck_session_handle_t sess, void *data, size_t len);
 
 
diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index 0172c74096..f729bd8ad0 100644
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -841,7 +841,7 @@ gnutls_pkcs11_token_get_random(const char *token_url,
 		return ret;
 	}
 
-	rv = pkcs11_get_random(sinfo.module, sinfo.pks, rnddata, len);
+	rv = _gnutls_pkcs11_get_random(sinfo.module, sinfo.pks, rnddata, len);
 	if (rv != CKR_OK) {
 		gnutls_assert();
 		_gnutls_debug_log("pkcs11: %s\n", pkcs11_strerror(rv));