diff options
| author | David Benjamin <davidben@chromium.org> | 2014-12-16 15:48:10 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-16 22:15:59 +0300 |
| commit | a6d81018f8fd5647d88a49923633f29dd77c2365 (patch) | |
| tree | a2182160a477558c1919642629a684046938c42b /crypto/pkcs8 | |
| parent | 263eac02f5c27ad91c1514c93246b84980f73c97 (diff) | |
Consistently use RAND_bytes and check for failure.
RAND_pseudo_bytes just calls RAND_bytes now and only returns 0 or 1. Switch all
callers within the library call the new one and use the simpler failure check.
This fixes a few error checks that no longer work (< 0) and some missing ones.
Change-Id: Id51c79deec80075949f73fa1fbd7b76aac5570c6
Reviewed-on: https://boringssl-review.googlesource.com/2621
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/pkcs8')
| -rw-r--r-- | crypto/pkcs8/p5_pbe.c | 2 | ||||
| -rw-r--r-- | crypto/pkcs8/p5_pbev2.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs8/p5_pbe.c b/crypto/pkcs8/p5_pbe.c index 9cdff4c4..7b18b6f8 100644 --- a/crypto/pkcs8/p5_pbe.c +++ b/crypto/pkcs8/p5_pbe.c @@ -104,7 +104,7 @@ int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter, sstr = ASN1_STRING_data(pbe->salt); if (salt) memcpy(sstr, salt, saltlen); - else if (RAND_pseudo_bytes(sstr, saltlen) < 0) + else if (!RAND_bytes(sstr, saltlen)) goto err; if(!ASN1_item_pack(pbe, ASN1_ITEM_rptr(PBEPARAM), &pbe_str)) diff --git a/crypto/pkcs8/p5_pbev2.c b/crypto/pkcs8/p5_pbev2.c index 85170a44..1af2af22 100644 --- a/crypto/pkcs8/p5_pbev2.c +++ b/crypto/pkcs8/p5_pbev2.c @@ -141,7 +141,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, { if (aiv) memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher)); - else if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0) + else if (!RAND_bytes(iv, EVP_CIPHER_iv_length(cipher))) goto err; } @@ -243,7 +243,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, if (salt) memcpy (osalt->data, salt, saltlen); - else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) + else if (!RAND_bytes(osalt->data, saltlen)) goto merr; if(iter <= 0) |