Skip to content

Commit 040100a

Browse files
mspncpmspncp
committed
prov/drbg: cleanup some RAND_DRBG leftovers
These are leftovers from the RAND_DRBG removal (#12509).
1 parent 9dd4813 commit 040100a

6 files changed

Lines changed: 5 additions & 45 deletions

File tree

‎crypto/err/openssl.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,17 +1136,10 @@ RAND_F_GET_ENTROPY:106:get_entropy
11361136
RAND_F_RAND_BYTES:100:RAND_bytes
11371137
RAND_F_RAND_BYTES_EX:126:rand_bytes_ex
11381138
RAND_F_RAND_DRBG_ENABLE_LOCKING:119:rand_drbg_enable_locking
1139-
RAND_F_RAND_DRBG_GENERATE:107:RAND_DRBG_generate
11401139
RAND_F_RAND_DRBG_GET_ENTROPY:120:rand_drbg_get_entropy
11411140
RAND_F_RAND_DRBG_GET_NONCE:123:rand_drbg_get_nonce
11421141
RAND_F_RAND_DRBG_INIT_METHOD:130:
1143-
RAND_F_RAND_DRBG_INSTANTIATE:108:RAND_DRBG_instantiate
1144-
RAND_F_RAND_DRBG_NEW:109:RAND_DRBG_new
1145-
RAND_F_RAND_DRBG_RESEED:110:RAND_DRBG_reseed
11461142
RAND_F_RAND_DRBG_RESTART:102:rand_drbg_restart
1147-
RAND_F_RAND_DRBG_SET:104:RAND_DRBG_set
1148-
RAND_F_RAND_DRBG_SET_DEFAULTS:121:RAND_DRBG_set_defaults
1149-
RAND_F_RAND_DRBG_UNINSTANTIATE:118:RAND_DRBG_uninstantiate
11501143
RAND_F_RAND_LOAD_FILE:111:RAND_load_file
11511144
RAND_F_RAND_POOL_ACQUIRE_ENTROPY:122:rand_pool_acquire_entropy
11521145
RAND_F_RAND_POOL_ADD:103:rand_pool_add

‎providers/fips/self_test_kats.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
315315
if (!EVP_RAND_set_ctx_params(test, drbg_params))
316316
goto err;
317317

318-
/* This calls RAND_DRBG_reseed() internally when prediction_resistance = 1 */
318+
/* This calls PROV_DRBG_reseed() internally when prediction_resistance = 1 */
319319
if (!EVP_RAND_generate(drbg, out, t->expectedlen, strength,
320320
prediction_resistance,
321321
t->entropyaddin2, t->entropyaddin2len))
@@ -329,7 +329,7 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
329329
if (!EVP_RAND_uninstantiate(drbg))
330330
goto err;
331331
/*
332-
* Check that the DRBG data has been zeroized after RAND_DRBG_uninstantiate.
332+
* Check that the DRBG data has been zeroized after PROV_DRBG_uninstantiate.
333333
*/
334334
if (!EVP_RAND_verify_zeroization(drbg))
335335
goto err;

‎providers/implementations/rands/drbg.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ static unsigned int get_parent_reseed_count(PROV_DRBG *drbg)
133133
}
134134

135135
/*
136-
* Implements the get_entropy() callback (see RAND_DRBG_set_callbacks())
136+
* Implements the get_entropy() callback
137137
*
138138
* If the DRBG has a parent, then the required amount of entropy input
139-
* is fetched using the parent's RAND_DRBG_generate().
139+
* is fetched using the parent's PROV_DRBG_generate().
140140
*
141141
* Otherwise, the entropy is polled from the system entropy sources
142142
* using prov_pool_acquire_entropy().
@@ -229,7 +229,7 @@ static size_t prov_drbg_get_entropy(PROV_DRBG *drbg, unsigned char **pout,
229229
}
230230

231231
/*
232-
* Implements the cleanup_entropy() callback (see RAND_DRBG_set_callbacks())
232+
* Implements the cleanup_entropy() callback
233233
*
234234
*/
235235
static void prov_drbg_cleanup_entropy(PROV_DRBG *drbg,

‎test/drbgtest.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77
* https://www.openssl.org/source/license.html
88
*/
99

10-
/*
11-
* RAND_DRBG_set is deprecated for public use, but still ok for
12-
* internal use.
13-
*/
14-
#include "internal/deprecated.h"
15-
1610
#include <string.h>
1711
#include "internal/nelem.h"
1812
#include <openssl/crypto.h>

‎util/libcrypto.num‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4198,17 +4198,6 @@ OSSL_STORE_LOADER_get0_engine 4287 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_
41984198
OPENSSL_fork_prepare 4288 3_0_0 EXIST:UNIX:FUNCTION:
41994199
OPENSSL_fork_parent 4289 3_0_0 EXIST:UNIX:FUNCTION:
42004200
OPENSSL_fork_child 4290 3_0_0 EXIST:UNIX:FUNCTION:
4201-
RAND_DRBG_instantiate 4292 3_0_0 NOEXIST::FUNCTION:
4202-
RAND_DRBG_uninstantiate 4293 3_0_0 NOEXIST::FUNCTION:
4203-
RAND_DRBG_set 4295 3_0_0 NOEXIST::FUNCTION:DEPRECATEDIN_3_0
4204-
RAND_DRBG_set_callbacks 4296 3_0_0 NOEXIST::FUNCTION:
4205-
RAND_DRBG_new 4297 3_0_0 NOEXIST::FUNCTION:
4206-
RAND_DRBG_set_reseed_interval 4298 3_0_0 NOEXIST::FUNCTION:
4207-
RAND_DRBG_free 4299 3_0_0 NOEXIST::FUNCTION:
4208-
RAND_DRBG_generate 4300 3_0_0 NOEXIST::FUNCTION:
4209-
RAND_DRBG_reseed 4301 3_0_0 NOEXIST::FUNCTION:
4210-
RAND_DRBG_set_ex_data 4302 3_0_0 NOEXIST::FUNCTION:
4211-
RAND_DRBG_get_ex_data 4303 3_0_0 NOEXIST::FUNCTION:
42124201
EVP_sha3_224 4304 3_0_0 EXIST::FUNCTION:
42134202
EVP_sha3_256 4305 3_0_0 EXIST::FUNCTION:
42144203
EVP_sha3_384 4306 3_0_0 EXIST::FUNCTION:
@@ -4223,7 +4212,6 @@ SCRYPT_PARAMS_it 4314 3_0_0 EXIST::FUNCTION:SCRYPT
42234212
CRYPTO_secure_clear_free 4315 3_0_0 EXIST::FUNCTION:
42244213
EVP_PKEY_meth_get0 4316 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
42254214
EVP_PKEY_meth_get_count 4317 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
4226-
RAND_DRBG_get0_public 4319 3_0_0 NOEXIST::FUNCTION:
42274215
RAND_priv_bytes 4320 3_0_0 EXIST::FUNCTION:
42284216
BN_priv_rand 4321 3_0_0 EXIST::FUNCTION:
42294217
BN_priv_rand_range 4322 3_0_0 EXIST::FUNCTION:
@@ -4233,7 +4221,6 @@ ASN1_TIME_compare 4325 3_0_0 EXIST::FUNCTION:
42334221
EVP_PKEY_CTX_ctrl_uint64 4326 3_0_0 EXIST::FUNCTION:
42344222
EVP_DigestFinalXOF 4327 3_0_0 EXIST::FUNCTION:
42354223
ERR_clear_last_mark 4328 3_0_0 EXIST::FUNCTION:
4236-
RAND_DRBG_get0_private 4329 3_0_0 NOEXIST::FUNCTION:
42374224
EVP_aria_192_ccm 4330 3_0_0 EXIST::FUNCTION:ARIA
42384225
EVP_aria_256_gcm 4331 3_0_0 EXIST::FUNCTION:ARIA
42394226
EVP_aria_256_ccm 4332 3_0_0 EXIST::FUNCTION:ARIA
@@ -4281,8 +4268,6 @@ RSA_set0_multi_prime_params 4376 3_0_0 EXIST::FUNCTION:RSA
42814268
RSA_get_version 4377 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
42824269
RSA_meth_get_multi_prime_keygen 4378 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
42834270
RSA_meth_set_multi_prime_keygen 4379 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA
4284-
RAND_DRBG_get0_master 4380 3_0_0 NOEXIST::FUNCTION:
4285-
RAND_DRBG_set_reseed_time_interval 4381 3_0_0 NOEXIST::FUNCTION:
42864271
PROFESSION_INFO_get0_addProfessionInfo 4382 3_0_0 EXIST::FUNCTION:
42874272
ADMISSION_SYNTAX_free 4383 3_0_0 EXIST::FUNCTION:
42884273
d2i_ADMISSION_SYNTAX 4384 3_0_0 EXIST::FUNCTION:
@@ -4332,7 +4317,6 @@ ADMISSION_SYNTAX_new 4427 3_0_0 EXIST::FUNCTION:
43324317
EVP_sha512_256 4428 3_0_0 EXIST::FUNCTION:
43334318
EVP_sha512_224 4429 3_0_0 EXIST::FUNCTION:
43344319
OCSP_basic_sign_ctx 4430 3_0_0 EXIST::FUNCTION:OCSP
4335-
RAND_DRBG_bytes 4431 3_0_0 NOEXIST::FUNCTION:
43364320
OSSL_STORE_vctrl 4433 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
43374321
OSSL_STORE_SEARCH_by_alias 4434 3_0_0 EXIST::FUNCTION:
43384322
BIO_bind 4435 3_0_0 EXIST::FUNCTION:SOCK
@@ -4352,13 +4336,11 @@ X509_get0_authority_key_id 4448 3_0_0 EXIST::FUNCTION:
43524336
OSSL_STORE_LOADER_set_find 4449 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0
43534337
OSSL_STORE_SEARCH_free 4450 3_0_0 EXIST::FUNCTION:
43544338
OSSL_STORE_SEARCH_get0_digest 4451 3_0_0 EXIST::FUNCTION:
4355-
RAND_DRBG_set_reseed_defaults 4452 3_0_0 NOEXIST::FUNCTION:
43564339
EVP_PKEY_new_raw_private_key 4453 3_0_0 EXIST::FUNCTION:
43574340
EVP_PKEY_new_raw_public_key 4454 3_0_0 EXIST::FUNCTION:
43584341
EVP_PKEY_new_CMAC_key 4455 3_0_0 EXIST::FUNCTION:
43594342
EVP_PKEY_asn1_set_set_priv_key 4456 3_0_0 EXIST::FUNCTION:
43604343
EVP_PKEY_asn1_set_set_pub_key 4457 3_0_0 EXIST::FUNCTION:
4361-
RAND_DRBG_set_defaults 4458 3_0_0 NOEXIST::FUNCTION:
43624344
conf_ssl_name_find 4469 3_0_0 EXIST::FUNCTION:
43634345
conf_ssl_get_cmd 4470 3_0_0 EXIST::FUNCTION:
43644346
conf_ssl_get 4471 3_0_0 EXIST::FUNCTION:
@@ -4643,7 +4625,6 @@ OSSL_CMP_MSG_free ? 3_0_0 EXIST::FUNCTION:CMP
46434625
ERR_load_CMP_strings ? 3_0_0 EXIST::FUNCTION:CMP
46444626
EVP_MD_CTX_set_params ? 3_0_0 EXIST::FUNCTION:
46454627
EVP_MD_CTX_get_params ? 3_0_0 EXIST::FUNCTION:
4646-
RAND_DRBG_new_ex ? 3_0_0 NOEXIST::FUNCTION:
46474628
OPENSSL_CTX_get0_primary_drbg ? 3_0_0 NOEXIST::FUNCTION:
46484629
OPENSSL_CTX_get0_public_drbg ? 3_0_0 NOEXIST::FUNCTION:
46494630
OPENSSL_CTX_get0_private_drbg ? 3_0_0 NOEXIST::FUNCTION:
@@ -4930,8 +4911,6 @@ EVP_PKEY_pairwise_check ? 3_0_0 EXIST::FUNCTION:
49304911
ASN1_item_verify_ctx ? 3_0_0 EXIST::FUNCTION:
49314912
ASN1_item_sign_with_libctx ? 3_0_0 EXIST::FUNCTION:
49324913
ASN1_item_verify_with_libctx ? 3_0_0 EXIST::FUNCTION:
4933-
RAND_DRBG_set_callback_data ? 3_0_0 NOEXIST::FUNCTION:
4934-
RAND_DRBG_get_callback_data ? 3_0_0 NOEXIST::FUNCTION:
49354914
BIO_socket_wait ? 3_0_0 EXIST::FUNCTION:SOCK
49364915
BIO_wait ? 3_0_0 EXIST::FUNCTION:
49374916
BIO_do_connect_retry ? 3_0_0 EXIST::FUNCTION:
@@ -5118,7 +5097,6 @@ EVP_RAND_enable_locking ? 3_0_0 EXIST::FUNCTION:
51185097
EVP_RAND_verify_zeroization ? 3_0_0 EXIST::FUNCTION:
51195098
EVP_RAND_strength ? 3_0_0 EXIST::FUNCTION:
51205099
EVP_RAND_state ? 3_0_0 EXIST::FUNCTION:
5121-
RAND_DRBG_verify_zeroization ? 3_0_0 NOEXIST::FUNCTION:
51225100
EVP_default_properties_is_fips_enabled ? 3_0_0 EXIST::FUNCTION:
51235101
EVP_default_properties_enable_fips ? 3_0_0 EXIST::FUNCTION:
51245102
EVP_PKEY_new_raw_private_key_with_libctx ? 3_0_0 EXIST::FUNCTION:

‎util/other.syms‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ OSSL_STORE_post_process_info_fn datatype
7171
OSSL_trace_cb datatype
7272
PROFESSION_INFO datatype
7373
PROFESSION_INFOS datatype
74-
RAND_DRBG_cleanup_entropy_fn datatype
75-
RAND_DRBG_cleanup_nonce_fn datatype
76-
RAND_DRBG_get_entropy_fn datatype
77-
RAND_DRBG_get_nonce_fn datatype
7874
RAND_poll_cb datatype
7975
SSL_CTX_allow_early_data_cb_fn datatype
8076
SSL_CTX_keylog_cb_func datatype
@@ -427,7 +423,6 @@ PEM_FLAG_EAY_COMPATIBLE define
427423
PEM_FLAG_ONLY_B64 define
428424
PEM_FLAG_SECURE define
429425
RAND_cleanup define deprecated 1.1.0
430-
RAND_DRBG_get_ex_new_index define
431426
SSL_COMP_free_compression_methods define deprecated 1.1.0
432427
SSL_CTX_add0_chain_cert define
433428
SSL_CTX_add1_chain_cert define

0 commit comments

Comments
 (0)