diff options
| -rw-r--r-- | crypto/mem_dbg.c | 4 | ||||
| -rw-r--r-- | include/openssl/crypto.h | 19 | ||||
| -rwxr-xr-x | util/libeay.num | 75 | ||||
| -rwxr-xr-x | util/mkdef.pl | 5 |
4 files changed, 56 insertions, 47 deletions
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 2132b7da5c..72487b5e03 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -134,7 +134,7 @@ */ static int mh_mode = CRYPTO_MEM_CHECK_OFF; -#ifdef CRYPTO_MDEBUG +#ifndef OPENSSL_NO_CRYPTO_MDEBUG static unsigned long order = 0; /* number of memory requests */ DECLARE_LHASH_OF(MEM); @@ -272,7 +272,7 @@ int CRYPTO_mem_ctrl(int mode) #endif } -#ifdef CRYPTO_MDEBUG +#ifndef OPENSSL_NO_CRYPTO_MDEBUG static int mem_check_on(void) { diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 65f150ed60..e8b9fcbf60 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -295,10 +295,11 @@ DEFINE_STACK_OF(void) * Set standard debugging functions (not done by default unless CRYPTO_MDEBUG * is defined) */ -# if defined CRYPTO_MDEBUG_ABORT -# ifndef CRYPTO_MDEBUG -# define CRYPTO_MDEBUG -# endif +# if defined(CRYPTO_MDEBUG_ABORT) && !defined(CRYPTO_MDEBUG) +# define CRYPTO_MDEBUG +# endif +# ifndef CRYPTO_MDEBUG +# define OPENSSL_NO_CRYPTO_MDEBUG # endif int CRYPTO_mem_ctrl(int mode); @@ -493,9 +494,10 @@ size_t CRYPTO_secure_used(void); void OPENSSL_cleanse(void *ptr, size_t len); -# define OPENSSL_mem_debug_push(info) \ +# ifndef OPENSSL_NO_CRYPTO_MDEBUG +# define OPENSSL_mem_debug_push(info) \ CRYPTO_mem_debug_push(info, __FILE__, __LINE__) -# define OPENSSL_mem_debug_pop() \ +# define OPENSSL_mem_debug_pop() \ CRYPTO_mem_debug_pop() int CRYPTO_mem_debug_push(const char *info, const char *file, int line); int CRYPTO_mem_debug_pop(void); @@ -512,10 +514,11 @@ void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag, const char *file, int line); void CRYPTO_mem_debug_free(void *addr, int flag); -# ifndef OPENSSL_NO_STDIO +# ifndef OPENSSL_NO_STDIO void CRYPTO_mem_leaks_fp(FILE *); -# endif +# endif void CRYPTO_mem_leaks(struct bio_st *bio); +# endif /* die if we have to */ void OpenSSLDie(const char *file, int line, const char *assertion); diff --git a/util/libeay.num b/util/libeay.num index 45e0d28ab5..56331b04b2 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -123,10 +123,10 @@ BN_dup 128 1_1_0 EXIST::FUNCTION: BN_free 129 1_1_0 EXIST::FUNCTION: BN_from_montgomery 130 1_1_0 EXIST::FUNCTION: BN_gcd 131 1_1_0 EXIST::FUNCTION: -BN_generate_prime 132 1_1_0 EXIST::FUNCTION:DEPRECATED +BN_generate_prime 132 1_1_0 NOEXIST::FUNCTION: BN_get_word 133 1_1_0 EXIST::FUNCTION: BN_is_bit_set 134 1_1_0 EXIST::FUNCTION: -BN_is_prime 135 1_1_0 EXIST::FUNCTION:DEPRECATED +BN_is_prime 135 1_1_0 NOEXIST::FUNCTION: BN_lshift 136 1_1_0 EXIST::FUNCTION: BN_lshift1 137 1_1_0 EXIST::FUNCTION: BN_mask_bits 138 1_1_0 EXIST::FUNCTION: @@ -165,41 +165,41 @@ CONF_get_section 173 1_1_0 EXIST::FUNCTION: CONF_get_string 174 1_1_0 EXIST::FUNCTION: CONF_load 175 1_1_0 EXIST::FUNCTION: CRYPTO_add_lock 176 1_1_0 EXIST::FUNCTION: -CRYPTO_mem_debug_free 177 1_1_0 EXIST::FUNCTION: -CRYPTO_mem_debug_malloc 178 1_1_0 EXIST::FUNCTION: -CRYPTO_mem_debug_realloc 179 1_1_0 EXIST::FUNCTION: +CRYPTO_mem_debug_free 177 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG +CRYPTO_mem_debug_malloc 178 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG +CRYPTO_mem_debug_realloc 179 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG CRYPTO_dbg_remalloc 180 1_1_0 NOEXIST::FUNCTION: CRYPTO_free 181 1_1_0 EXIST::FUNCTION: CRYPTO_get_add_lock_callback 182 1_1_0 EXIST::FUNCTION: -CRYPTO_get_id_callback 183 1_1_0 EXIST::FUNCTION:DEPRECATED -CRYPTO_get_lock_name 184 1_1_0 EXIST::FUNCTION: +CRYPTO_get_id_callback 183 1_1_0 NOEXIST::FUNCTION: +CRYPTO_get_lock_name 184 1_1_0 NOEXIST::FUNCTION: CRYPTO_get_locking_callback 185 1_1_0 EXIST::FUNCTION: CRYPTO_get_mem_functions 186 1_1_0 EXIST::FUNCTION: CRYPTO_lock 187 1_1_0 EXIST::FUNCTION: CRYPTO_malloc 188 1_1_0 EXIST::FUNCTION: CRYPTO_mem_ctrl 189 1_1_0 EXIST::FUNCTION: -CRYPTO_mem_leaks 190 1_1_0 EXIST::FUNCTION: +CRYPTO_mem_leaks 190 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG CRYPTO_mem_leaks_cb 191 1_1_0 NOEXIST::FUNCTION: -CRYPTO_mem_leaks_fp 192 1_1_0 EXIST::FUNCTION:STDIO +CRYPTO_mem_leaks_fp 192 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG,STDIO CRYPTO_realloc 193 1_1_0 EXIST::FUNCTION: CRYPTO_remalloc 194 1_1_0 NOEXIST::FUNCTION: CRYPTO_set_add_lock_callback 195 1_1_0 EXIST::FUNCTION: -CRYPTO_set_id_callback 196 1_1_0 EXIST::FUNCTION:DEPRECATED +CRYPTO_set_id_callback 196 1_1_0 NOEXIST::FUNCTION: CRYPTO_set_locking_callback 197 1_1_0 EXIST::FUNCTION: CRYPTO_set_mem_functions 198 1_1_0 EXIST::FUNCTION: -CRYPTO_thread_id 199 1_1_0 EXIST::FUNCTION:DEPRECATED +CRYPTO_thread_id 199 1_1_0 NOEXIST::FUNCTION: DH_check 200 1_1_0 EXIST::FUNCTION:DH DH_compute_key 201 1_1_0 EXIST::FUNCTION:DH DH_free 202 1_1_0 EXIST::FUNCTION:DH DH_generate_key 203 1_1_0 EXIST::FUNCTION:DH -DH_generate_parameters 204 1_1_0 EXIST::FUNCTION:DEPRECATED,DH +DH_generate_parameters 204 1_1_0 NOEXIST::FUNCTION: DH_new 205 1_1_0 EXIST::FUNCTION:DH DH_size 206 1_1_0 EXIST::FUNCTION:DH DHparams_print 207 1_1_0 EXIST::FUNCTION:DH DHparams_print_fp 208 1_1_0 EXIST::FUNCTION:DH,STDIO DSA_free 209 1_1_0 EXIST::FUNCTION:DSA DSA_generate_key 210 1_1_0 EXIST::FUNCTION:DSA -DSA_generate_parameters 211 1_1_0 EXIST::FUNCTION:DEPRECATED,DSA +DSA_generate_parameters 211 1_1_0 NOEXIST::FUNCTION: DSA_is_prime 212 1_1_0 NOEXIST::FUNCTION: DSA_new 213 1_1_0 EXIST::FUNCTION:DSA DSA_print 214 1_1_0 EXIST::FUNCTION:DSA @@ -217,7 +217,7 @@ ERR_func_error_string 225 1_1_0 EXIST::FUNCTION: ERR_get_err_state_table 226 1_1_0 EXIST::FUNCTION: ERR_get_error 227 1_1_0 EXIST::FUNCTION: ERR_get_error_line 228 1_1_0 EXIST::FUNCTION: -ERR_get_state 229 1_1_0 EXIST::FUNCTION: +ERR_get_state 229 1_1_0 NOEXIST::FUNCTION: ERR_get_string_table 230 1_1_0 EXIST::FUNCTION: ERR_lib_error_string 231 1_1_0 EXIST::FUNCTION: ERR_load_ASN1_strings 232 1_1_0 EXIST::FUNCTION: @@ -242,7 +242,7 @@ ERR_print_errors 250 1_1_0 EXIST::FUNCTION: ERR_print_errors_fp 251 1_1_0 EXIST::FUNCTION:STDIO ERR_put_error 252 1_1_0 EXIST::FUNCTION: ERR_reason_error_string 253 1_1_0 EXIST::FUNCTION: -ERR_remove_state 254 1_1_0 EXIST::FUNCTION:DEPRECATED +ERR_remove_state 254 1_1_0 NOEXIST::FUNCTION: EVP_BytesToKey 255 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_cleanup 256 1_1_0 EXIST::FUNCTION: EVP_CipherFinal 257 1_1_0 EXIST::FUNCTION: @@ -359,9 +359,9 @@ PEM_ASN1_read 367 1_1_0 EXIST::FUNCTION:STDIO PEM_ASN1_read_bio 368 1_1_0 EXIST::FUNCTION: PEM_ASN1_write 369 1_1_0 EXIST::FUNCTION:STDIO PEM_ASN1_write_bio 370 1_1_0 EXIST::FUNCTION: -PEM_SealFinal 371 1_1_0 EXIST::FUNCTION:RSA -PEM_SealInit 372 1_1_0 EXIST::FUNCTION:RSA -PEM_SealUpdate 373 1_1_0 EXIST::FUNCTION:RSA +PEM_SealFinal 371 1_1_0 NOEXIST::FUNCTION: +PEM_SealInit 372 1_1_0 NOEXIST::FUNCTION: +PEM_SealUpdate 373 1_1_0 NOEXIST::FUNCTION: PEM_SignFinal 374 1_1_0 EXIST::FUNCTION: PEM_SignInit 375 1_1_0 EXIST::FUNCTION: PEM_SignUpdate 376 1_1_0 EXIST::FUNCTION: @@ -457,7 +457,7 @@ RAND_cleanup 465 1_1_0 EXIST::FUNCTION: RAND_file_name 466 1_1_0 EXIST::FUNCTION: RAND_load_file 467 1_1_0 EXIST::FUNCTION: RAND_screen 468 1_1_0 EXIST:WIN32:FUNCTION: -RAND_seed 469 1_1_0 EXIST::FUNCTION: +RAND_seed 469 1_1_0 NOEXIST::FUNCTION: RAND_write_file 470 1_1_0 EXIST::FUNCTION: RC2_cbc_encrypt 471 1_1_0 EXIST::FUNCTION:RC2 RC2_cfb64_encrypt 472 1_1_0 EXIST::FUNCTION:RC2 @@ -473,7 +473,7 @@ RSAPrivateKey_dup 481 1_1_0 EXIST::FUNCTION:RSA RSAPublicKey_dup 482 1_1_0 EXIST::FUNCTION:RSA RSA_PKCS1_OpenSSL 483 1_1_0 EXIST::FUNCTION:RSA RSA_free 484 1_1_0 EXIST::FUNCTION:RSA -RSA_generate_key 485 1_1_0 EXIST::FUNCTION:DEPRECATED,RSA +RSA_generate_key 485 1_1_0 NOEXIST::FUNCTION: RSA_new 486 1_1_0 EXIST::FUNCTION:RSA RSA_new_method 487 1_1_0 EXIST::FUNCTION:RSA RSA_print 488 1_1_0 EXIST::FUNCTION:RSA @@ -942,7 +942,7 @@ EVP_rc2_40_cbc 959 1_1_0 EXIST::FUNCTION:RC2 EVP_rc4_40 960 1_1_0 EXIST::FUNCTION:RC4 EVP_CIPHER_CTX_init 961 1_1_0 EXIST::FUNCTION: HMAC 962 1_1_0 EXIST::FUNCTION: -HMAC_Init 963 1_1_0 EXIST::FUNCTION:DEPRECATED +HMAC_Init 963 1_1_0 NOEXIST::FUNCTION: HMAC_Update 964 1_1_0 EXIST::FUNCTION: HMAC_Final 965 1_1_0 EXIST::FUNCTION: ERR_get_next_error_library 966 1_1_0 EXIST::FUNCTION: @@ -1097,7 +1097,7 @@ bn_mul_part_recursive 1125 1_1_0 NOEXIST::FUNCTION: bn_sqr_recursive 1126 1_1_0 NOEXIST::FUNCTION: bn_mul_low_normal 1127 1_1_0 NOEXIST::FUNCTION: BN_RECP_CTX_init 1128 1_1_0 NOEXIST::FUNCTION: -BN_RECP_CTX_new 1129 1_1_0 EXIST::FUNCTION: +BN_RECP_CTX_new 1129 1_1_0 NOEXIST::FUNCTION: BN_RECP_CTX_free 1130 1_1_0 EXIST::FUNCTION: BN_RECP_CTX_set 1131 1_1_0 EXIST::FUNCTION: BN_mod_mul_reciprocal 1132 1_1_0 EXIST::FUNCTION: @@ -1220,8 +1220,8 @@ BIO_f_reliable 1244 1_1_0 EXIST::FUNCTION: PKCS7_dataFinal 1245 1_1_0 EXIST::FUNCTION: PKCS7_dataDecode 1246 1_1_0 EXIST::FUNCTION: X509V3_EXT_CRL_add_conf 1247 1_1_0 EXIST::FUNCTION: -BN_set_params 1248 1_1_0 EXIST::FUNCTION:DEPRECATED -BN_get_params 1249 1_1_0 EXIST::FUNCTION:DEPRECATED +BN_set_params 1248 1_1_0 NOEXIST::FUNCTION: +BN_get_params 1249 1_1_0 NOEXIST::FUNCTION: BIO_get_ex_num 1250 1_1_0 NOEXIST::FUNCTION: BIO_set_ex_free_func 1251 1_1_0 NOEXIST::FUNCTION: EVP_ripemd160 1252 1_1_0 EXIST::FUNCTION:RMD160 @@ -1726,7 +1726,7 @@ BIO_number_written 2202 1_1_0 EXIST::FUNCTION: BIO_number_read 2203 1_1_0 EXIST::FUNCTION: X509_STORE_CTX_get1_chain 2204 1_1_0 EXIST::FUNCTION: ERR_load_RAND_strings 2205 1_1_0 EXIST::FUNCTION: -RAND_pseudo_bytes 2206 1_1_0 EXIST::FUNCTION:DEPRECATED +RAND_pseudo_bytes 2206 1_1_0 NOEXIST::FUNCTION: X509_REQ_get_attr_by_NID 2207 1_1_0 EXIST::FUNCTION: X509_REQ_get_attr 2208 1_1_0 EXIST::FUNCTION: X509_REQ_add1_attr_by_NID 2209 1_1_0 EXIST::FUNCTION: @@ -1741,7 +1741,7 @@ X509_REQ_add1_attr_by_txt 2217 1_1_0 EXIST::FUNCTION: X509_ATTRIBUTE_create_by_txt 2218 1_1_0 EXIST::FUNCTION: X509at_add1_attr_by_txt 2219 1_1_0 EXIST::FUNCTION: BN_pseudo_rand 2239 1_1_0 EXIST::FUNCTION: -BN_is_prime_fasttest 2240 1_1_0 EXIST::FUNCTION:DEPRECATED +BN_is_prime_fasttest 2240 1_1_0 NOEXIST::FUNCTION: BN_CTX_end 2241 1_1_0 EXIST::FUNCTION: BN_CTX_start 2242 1_1_0 EXIST::FUNCTION: BN_CTX_get 2243 1_1_0 EXIST::FUNCTION: @@ -1994,7 +1994,7 @@ EC_GROUP_method_of 2568 1_1_0 EXIST::FUNCTION:EC i2d_KRB5_APREQ 2569 1_1_0 NOEXIST::FUNCTION: _ossl_old_des_encrypt 2570 1_1_0 NOEXIST::FUNCTION: ASN1_PRINTABLE_new 2571 1_1_0 EXIST::FUNCTION: -HMAC_Init_ex 2572 1_1_0 EXIST::FUNCTION: +HMAC_Init_ex 2572 1_1_0 NOEXIST::FUNCTION: d2i_KRB5_AUTHENT 2573 1_1_0 NOEXIST::FUNCTION: OCSP_archive_cutoff_new 2574 1_1_0 EXIST::FUNCTION: EC_POINT_set_Jprojective_coordinates_GFp 2575 1_1_0 EXIST:!VMS:FUNCTION:EC @@ -2879,7 +2879,7 @@ STORE_method_set_list_start_function 3336 1_1_0 NOEXIST::FUNCTION: BN_BLINDING_invert_ex 3337 1_1_0 EXIST::FUNCTION: NAME_CONSTRAINTS_free 3338 1_1_0 EXIST::FUNCTION: STORE_ATTR_INFO_set_number 3339 1_1_0 NOEXIST::FUNCTION: -BN_BLINDING_get_thread_id 3340 1_1_0 EXIST::FUNCTION:DEPRECATED +BN_BLINDING_get_thread_id 3340 1_1_0 NOEXIST::FUNCTION: X509_STORE_CTX_set0_param 3341 1_1_0 EXIST::FUNCTION: POLICY_MAPPING_it 3342 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: POLICY_MAPPING_it 3342 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -3255,8 +3255,8 @@ EC_KEY_set_public_key 3682 1_1_0 EXIST::FUNCTION:EC PEM_read_ECPKParameters 3683 1_1_0 EXIST::FUNCTION:EC X509_CERT_PAIR_new 3684 1_1_0 NOEXIST::FUNCTION: ENGINE_register_STORE 3685 1_1_0 EXIST::FUNCTION:ENGINE -RSA_generate_key_ex 3686 1_1_0 EXIST::FUNCTION:RSA -DSA_generate_parameters_ex 3687 1_1_0 EXIST::FUNCTION:DSA +RSA_generate_key_ex 3686 1_1_0 NOEXIST::FUNCTION: +DSA_generate_parameters_ex 3687 1_1_0 NOEXIST::FUNCTION: ECParameters_print_fp 3688 1_1_0 EXIST::FUNCTION:EC,STDIO X509V3_NAME_from_section 3689 1_1_0 EXIST::FUNCTION: EVP_PKEY_add1_attr 3690 1_1_0 EXIST::FUNCTION: @@ -3281,10 +3281,10 @@ ECDSA_size 3706 1_1_0 EXIST::FUNCTION:EC d2i_EC_PUBKEY_bio 3707 1_1_0 EXIST::FUNCTION:EC BN_get0_nist_prime_521 3708 1_1_0 EXIST::FUNCTION: STORE_ATTR_INFO_modify_sha1str 3709 1_1_0 NOEXIST::FUNCTION: -BN_generate_prime_ex 3710 1_1_0 EXIST::FUNCTION: +BN_generate_prime_ex 3710 1_1_0 NOEXIST::FUNCTION: EC_GROUP_new_by_curve_name 3711 1_1_0 EXIST::FUNCTION:EC SHA256_Final 3712 1_1_0 EXIST::FUNCTION: -DH_generate_parameters_ex 3713 1_1_0 EXIST::FUNCTION:DH +DH_generate_parameters_ex 3713 1_1_0 NOEXIST::FUNCTION: PEM_read_bio_ECPrivateKey 3714 1_1_0 EXIST::FUNCTION:EC STORE_meth_get_cleanup_fn 3715 1_1_0 NOEXIST::FUNCTION: STORE_method_get_cleanup_function 3715 1_1_0 NOEXIST::FUNCTION: @@ -3344,7 +3344,7 @@ pqueue_insert 3766 1_1_0 EXIST::FUNCTION: pitem_free 3767 1_1_0 EXIST::FUNCTION: BN_GF2m_mod_inv_arr 3768 1_1_0 EXIST::FUNCTION:EC2M ENGINE_unregister_ECDSA 3769 1_1_0 NOEXIST::FUNCTION: -BN_BLINDING_set_thread_id 3770 1_1_0 EXIST::FUNCTION:DEPRECATED +BN_BLINDING_set_thread_id 3770 1_1_0 NOEXIST::FUNCTION: get_rfc3526_prime_8192 3771 1_1_0 EXIST::FUNCTION: X509_VERIFY_PARAM_clear_flags 3772 1_1_0 EXIST::FUNCTION: get_rfc2409_prime_1024 3773 1_1_0 EXIST::FUNCTION: @@ -3832,7 +3832,7 @@ d2i_TS_MSG_IMPRINT 4235 1_1_0 EXIST::FUNCTION: EVP_PKEY_meth_set_ctrl 4236 1_1_0 EXIST::FUNCTION: TS_REQ_get_ext_by_NID 4237 1_1_0 EXIST::FUNCTION: PKCS5_pbe_set0_algor 4238 1_1_0 EXIST::FUNCTION: -BN_BLINDING_thread_id 4239 1_1_0 EXIST::FUNCTION: +BN_BLINDING_thread_id 4239 1_1_0 NOEXIST::FUNCTION: TS_ACCURACY_new 4240 1_1_0 EXIST::FUNCTION: X509_CRL_METHOD_free 4241 1_1_0 EXIST::FUNCTION: ASN1_PCTX_get_nm_flags 4242 1_1_0 EXIST::FUNCTION: @@ -4720,6 +4720,9 @@ X509_VERIFY_PARAM_move_peername 5114 1_1_0 EXIST::FUNCTION: X509_STORE_CTX_set0_dane 5115 1_1_0 EXIST::FUNCTION: CRYPTO_secure_used 5116 1_1_0 EXIST::FUNCTION: CRYPTO_clear_realloc 5117 1_1_0 EXIST::FUNCTION: -CRYPTO_mem_debug_push 5118 1_1_0 EXIST::FUNCTION: +CRYPTO_mem_debug_push 5118 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG CRYPTO_set_mem_debug 5119 1_1_0 EXIST::FUNCTION: -CRYPTO_mem_debug_pop 5120 1_1_0 EXIST::FUNCTION: +CRYPTO_mem_debug_pop 5120 1_1_0 EXIST::FUNCTION:CRYPTO_MDEBUG +DEPRECATEDIN_1_0_0 5121 1_1_0 EXIST::FUNCTION: +DEPRECATEDIN_0_9_8 5122 1_1_0 EXIST::FUNCTION:DH,DSA,RSA +DEPRECATEDIN_1_1_0 5123 1_1_0 EXIST::FUNCTION: diff --git a/util/mkdef.pl b/util/mkdef.pl index fd36a0d7da..9478f3081c 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -81,6 +81,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "LOCKING", # External "algorithms" "FP_API", "STDIO", "SOCK", "DGRAM", + "CRYPTO_MDEBUG", # Engines "STATIC_ENGINE", "ENGINE", "HW", "GMP", # X.509v3 Signed Certificate Timestamps @@ -135,7 +136,7 @@ my $no_fp_api; my $no_static_engine=1; my $no_deprecated; my $no_sct; my $no_rfc3779; my $no_psk; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace; -my $no_unit_test; my $no_ssl3_method; my $no_ocb; +my $no_unit_test; my $no_ssl3_method; my $no_ocb; my $no_crypto_mdebug; my $zlib; @@ -237,6 +238,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-unit-test$/){ $no_unit_test=1; } elsif (/^no-deprecated$/) { $no_deprecated=1; } elsif (/^no-ocb/){ $no_ocb=1; } + elsif (/^no-crypto-mdebug/){ $no_crypto_mdebug=1; } } @@ -1221,6 +1223,7 @@ sub is_valid if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } if ($keyword eq "OCB" && $no_ocb) { return 0; } + if ($keyword eq "CRYPTO_MDEBUG" && $no_crypto_mdebug) { return 0; } # Nothing recognise as true return 1; |