diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-10-17 14:10:08 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-11-04 02:54:06 +0100 |
| commit | 34d25befa62ceba5af915f25393c5f62093d4591 (patch) | |
| tree | d668fb3891ec725134cc86a540950b0cda814691 /lib/x509 | |
| parent | e4c739fe0b9e568333bf43358fbc3db6b96fe1a1 (diff) | |
| download | gnutls-34d25befa62ceba5af915f25393c5f62093d4591.tar.gz | |
deprecated _gnutls_rnd() in favor of exported gnutls_rnd()
Diffstat (limited to 'lib/x509')
| -rw-r--r-- | lib/x509/pkcs12.c | 2 | ||||
| -rw-r--r-- | lib/x509/pkcs7-crypt.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c index 9b280ba857..1690be323f 100644 --- a/lib/x509/pkcs12.c +++ b/lib/x509/pkcs12.c @@ -881,7 +881,7 @@ int gnutls_pkcs12_generate_mac2(gnutls_pkcs12_t pkcs12, gnutls_mac_algorithm_t m /* Generate the salt. */ - result = _gnutls_rnd(GNUTLS_RND_NONCE, salt, sizeof(salt)); + result = gnutls_rnd(GNUTLS_RND_NONCE, salt, sizeof(salt)); if (result < 0) { gnutls_assert(); return result; diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c index 7f67376ce0..4eecc29146 100644 --- a/lib/x509/pkcs7-crypt.c +++ b/lib/x509/pkcs7-crypt.c @@ -1279,7 +1279,7 @@ _gnutls_pkcs_generate_key(schema_id schema, if (password) pass_len = strlen(password); - ret = _gnutls_rnd(GNUTLS_RND_RANDOM, rnd, 2); + ret = gnutls_rnd(GNUTLS_RND_RANDOM, rnd, 2); if (ret < 0) { gnutls_assert(); return ret; @@ -1301,7 +1301,7 @@ _gnutls_pkcs_generate_key(schema_id schema, return GNUTLS_E_INVALID_REQUEST; } - ret = _gnutls_rnd(GNUTLS_RND_RANDOM, kdf_params->salt, + ret = gnutls_rnd(GNUTLS_RND_RANDOM, kdf_params->salt, kdf_params->salt_size); if (ret < 0) { gnutls_assert(); @@ -1329,7 +1329,7 @@ _gnutls_pkcs_generate_key(schema_id schema, kdf_params->key_size, key->data); if (enc_params->iv_size) { - ret = _gnutls_rnd(GNUTLS_RND_NONCE, + ret = gnutls_rnd(GNUTLS_RND_NONCE, enc_params->iv, enc_params->iv_size); if (ret < 0) { gnutls_assert(); |