QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-03 04:59:39 +00:00
Code Issues Projects Releases Wiki Activity

crypto/rand: fix some style nit's

Browse Source 
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7378)
This commit is contained in:
FdaSilvaYY 2017-09-15 21:14:34 +02:00 committed by Richard Levitte
parent d90e128be6
commit c2e33a05b1
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/rand/drbg_ctr.c
View File

@ -401,10 +401,10 @@ int drbg_ctr_init(RAND_DRBG *drbg)
if ((drbg->flags & RAND_DRBG_FLAG_CTR_NO_DF) == 0) { if ((drbg->flags & RAND_DRBG_FLAG_CTR_NO_DF) == 0) {
/* df initialisation */ /* df initialisation */
static const unsigned char df_key[32] = { static const unsigned char df_key[32] = {
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
}; };
if (ctr->ctx_df == NULL) if (ctr->ctx_df == NULL)

12
crypto/rand/drbg_lib.c
View File

@ -286,7 +286,7 @@ static RAND_DRBG *rand_drbg_new(int secure,
return drbg; return drbg;
err: err:
if (drbg->secure) if (drbg->secure)
OPENSSL_secure_free(drbg); OPENSSL_secure_free(drbg);
else else
@ -378,7 +378,7 @@ int RAND_DRBG_instantiate(RAND_DRBG *drbg,
entropylen = drbg->get_entropy(drbg, &entropy, min_entropy, entropylen = drbg->get_entropy(drbg, &entropy, min_entropy,
min_entropylen, max_entropylen, 0); min_entropylen, max_entropylen, 0);
if (entropylen < min_entropylen if (entropylen < min_entropylen
|| entropylen > max_entropylen) { || entropylen > max_entropylen) {
RANDerr(RAND_F_RAND_DRBG_INSTANTIATE, RAND_R_ERROR_RETRIEVING_ENTROPY); RANDerr(RAND_F_RAND_DRBG_INSTANTIATE, RAND_R_ERROR_RETRIEVING_ENTROPY);
goto end; goto end;
} }
@ -408,10 +408,10 @@ int RAND_DRBG_instantiate(RAND_DRBG *drbg,
drbg->reseed_prop_counter = drbg->parent->reseed_prop_counter; drbg->reseed_prop_counter = drbg->parent->reseed_prop_counter;
} }
end: end:
if (entropy != NULL && drbg->cleanup_entropy != NULL) if (entropy != NULL && drbg->cleanup_entropy != NULL)
drbg->cleanup_entropy(drbg, entropy, entropylen); drbg->cleanup_entropy(drbg, entropy, entropylen);
if (nonce != NULL && drbg->cleanup_nonce!= NULL ) if (nonce != NULL && drbg->cleanup_nonce != NULL)
drbg->cleanup_nonce(drbg, nonce, noncelen); drbg->cleanup_nonce(drbg, nonce, noncelen);
if (drbg->pool != NULL) { if (drbg->pool != NULL) {
if (drbg->state == DRBG_READY) { if (drbg->state == DRBG_READY) {
@ -504,7 +504,7 @@ int RAND_DRBG_reseed(RAND_DRBG *drbg,
drbg->max_entropylen, drbg->max_entropylen,
prediction_resistance); prediction_resistance);
if (entropylen < drbg->min_entropylen if (entropylen < drbg->min_entropylen
|| entropylen > drbg->max_entropylen) { || entropylen > drbg->max_entropylen) {
RANDerr(RAND_F_RAND_DRBG_RESEED, RAND_R_ERROR_RETRIEVING_ENTROPY); RANDerr(RAND_F_RAND_DRBG_RESEED, RAND_R_ERROR_RETRIEVING_ENTROPY);
goto end; goto end;
} }
@ -522,7 +522,7 @@ int RAND_DRBG_reseed(RAND_DRBG *drbg,
drbg->reseed_prop_counter = drbg->parent->reseed_prop_counter; drbg->reseed_prop_counter = drbg->parent->reseed_prop_counter;
} }
end: end:
if (entropy != NULL && drbg->cleanup_entropy != NULL) if (entropy != NULL && drbg->cleanup_entropy != NULL)
drbg->cleanup_entropy(drbg, entropy, entropylen); drbg->cleanup_entropy(drbg, entropy, entropylen);
if (drbg->state == DRBG_READY) if (drbg->state == DRBG_READY)

4
crypto/rand/rand_win.c
View File

@ -67,7 +67,7 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool)
if (buffer != NULL) { if (buffer != NULL) {
size_t bytes = 0; size_t bytes = 0;
if (BCryptGenRandom(NULL, buffer, bytes_needed, if (BCryptGenRandom(NULL, buffer, bytes_needed,
BCRYPT_USE_SYSTEM_PREFERRED_RNG) == STATUS_SUCCESS) BCRYPT_USE_SYSTEM_PREFERRED_RNG) == STATUS_SUCCESS)
bytes = bytes_needed; bytes = bytes_needed;
rand_pool_add_end(pool, bytes, 8 * bytes); rand_pool_add_end(pool, bytes, 8 * bytes);
@ -82,7 +82,7 @@ size_t rand_pool_acquire_entropy(RAND_POOL *pool)
size_t bytes = 0; size_t bytes = 0;
/* poll the CryptoAPI PRNG */ /* poll the CryptoAPI PRNG */
if (CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL, if (CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) { CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0) if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
bytes = bytes_needed; bytes = bytes_needed;

4
util/indent.pro
View File

@ -637,3 +637,7 @@
-T ossl_uintmax_t -T ossl_uintmax_t
-T ossl_uintmax_t -T ossl_uintmax_t
-T CT_POLICY_EVAL_CTX -T CT_POLICY_EVAL_CTX
-T RAND_DRBG
-T RAND_DRBG_CTR
-T RAND_POOL
-T RAND_METHOD