summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-20 13:48:57 +0100
committerMatt Caswell <matt@openssl.org>2016-04-20 16:49:27 +0100
commit00deac3ef6a1ed0645161341ca4eae63cac75d5c (patch)
tree13a08055570345f67ebc09c633bd71c7b18b4455
parentac3d0e13777a0f0533792ed8fdd7de485675a3a2 (diff)
Fix no-ui on Windows
Ensure public functions have appropriate guards in header files. GH Issue 899 Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--include/openssl/ui.h20
-rw-r--r--util/libcrypto.num104
2 files changed, 64 insertions, 60 deletions
diff --git a/include/openssl/ui.h b/include/openssl/ui.h
index 3d1507ee00..16ff4c84e3 100644
--- a/include/openssl/ui.h
+++ b/include/openssl/ui.h
@@ -59,13 +59,16 @@
#ifndef HEADER_UI_H
# define HEADER_UI_H
-# if OPENSSL_API_COMPAT < 0x10100000L
-# include <openssl/crypto.h>
-# endif
-# include <openssl/safestack.h>
-# include <openssl/ossl_typ.h>
# include <openssl/opensslconf.h>
+# ifndef OPENSSL_NO_UI
+
+# if OPENSSL_API_COMPAT < 0x10100000L
+# include <openssl/crypto.h>
+# endif
+# include <openssl/safestack.h>
+# include <openssl/ossl_typ.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -160,7 +163,7 @@ int UI_dup_error_string(UI *ui, const char *text);
* each UI being marked with this flag, or the application might get
* confused.
*/
-# define UI_INPUT_FLAG_DEFAULT_PWD 0x02
+# define UI_INPUT_FLAG_DEFAULT_PWD 0x02
/*-
* The user of these routines may want to define flags of their own. The core
@@ -172,7 +175,7 @@ int UI_dup_error_string(UI *ui, const char *text);
* #define MY_UI_FLAG1 (0x01 << UI_INPUT_FLAG_USER_BASE)
*
*/
-# define UI_INPUT_FLAG_USER_BASE 16
+# define UI_INPUT_FLAG_USER_BASE 16
/*-
* The following function helps construct a prompt. object_desc is a
@@ -229,7 +232,7 @@ int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void));
* OpenSSL error stack before printing any info or added error messages and
* before any prompting.
*/
-# define UI_CTRL_PRINT_ERRORS 1
+# define UI_CTRL_PRINT_ERRORS 1
/*
* Check if a UI_process() is possible to do again with the same instance of
* a user interface. This makes UI_ctrl() return 1 if it is redoable, and 0
@@ -413,4 +416,5 @@ void ERR_load_UI_strings(void);
#ifdef __cplusplus
}
#endif
+# endif /* OPENSSL_NO_UI */
#endif
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 6c0553bb9c..c943be6ff7 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -31,7 +31,7 @@ GENERAL_NAME_get0_otherName 29 1_1_0 EXIST::FUNCTION:
ASN1_INTEGER_get_uint64 30 1_1_0 EXIST::FUNCTION:
EVP_DigestInit_ex 31 1_1_0 EXIST::FUNCTION:
CTLOG_new 32 1_1_0 EXIST::FUNCTION:CT
-UI_get_result_minsize 33 1_1_0 EXIST::FUNCTION:
+UI_get_result_minsize 33 1_1_0 EXIST::FUNCTION:UI
EVP_PBE_alg_add_type 34 1_1_0 EXIST::FUNCTION:
EVP_cast5_ofb 35 1_1_0 EXIST::FUNCTION:CAST
d2i_PUBKEY_fp 36 1_1_0 EXIST::FUNCTION:STDIO
@@ -40,7 +40,7 @@ BF_decrypt 38 1_1_0 EXIST::FUNCTION:BF
PEM_read_bio_PUBKEY 39 1_1_0 EXIST::FUNCTION:
X509_NAME_delete_entry 40 1_1_0 EXIST::FUNCTION:
EVP_PKEY_meth_set_verify_recover 41 1_1_0 EXIST::FUNCTION:
-UI_set_method 42 1_1_0 EXIST::FUNCTION:
+UI_set_method 42 1_1_0 EXIST::FUNCTION:UI
PKCS7_ISSUER_AND_SERIAL_it 43 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
PKCS7_ISSUER_AND_SERIAL_it 43 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
EC_GROUP_method_of 44 1_1_0 EXIST::FUNCTION:EC
@@ -79,7 +79,7 @@ ASN1_item_print 76 1_1_0 EXIST::FUNCTION:
CONF_set_nconf 77 1_1_0 EXIST::FUNCTION:
RAND_set_rand_method 78 1_1_0 EXIST::FUNCTION:
BN_GF2m_mod_mul 79 1_1_0 EXIST::FUNCTION:EC2M
-UI_add_input_boolean 80 1_1_0 EXIST::FUNCTION:
+UI_add_input_boolean 80 1_1_0 EXIST::FUNCTION:UI
ASN1_TIME_adj 81 1_1_0 EXIST::FUNCTION:
EVP_PKEY_asn1_get0_info 82 1_1_0 EXIST::FUNCTION:
BN_add_word 83 1_1_0 EXIST::FUNCTION:
@@ -210,7 +210,7 @@ SCT_set_version 206 1_1_0 EXIST::FUNCTION:CT
CMS_add1_ReceiptRequest 207 1_1_0 EXIST::FUNCTION:CMS
d2i_CRL_DIST_POINTS 208 1_1_0 EXIST::FUNCTION:
X509_CRL_INFO_free 209 1_1_0 EXIST::FUNCTION:
-ERR_load_UI_strings 210 1_1_0 EXIST::FUNCTION:
+ERR_load_UI_strings 210 1_1_0 EXIST::FUNCTION:UI
ERR_load_strings 211 1_1_0 EXIST::FUNCTION:
RSA_X931_hash_id 212 1_1_0 EXIST::FUNCTION:RSA
EC_KEY_set_method 213 1_1_0 EXIST::FUNCTION:EC
@@ -277,7 +277,7 @@ EVP_OpenInit 272 1_1_0 EXIST::FUNCTION:RSA
OCSP_response_get1_basic 273 1_1_0 EXIST::FUNCTION:
CRYPTO_gcm128_tag 274 1_1_0 EXIST::FUNCTION:
OCSP_parse_url 275 1_1_0 EXIST::FUNCTION:
-UI_get0_test_string 276 1_1_0 EXIST::FUNCTION:
+UI_get0_test_string 276 1_1_0 EXIST::FUNCTION:UI
CRYPTO_secure_free 277 1_1_0 EXIST::FUNCTION:
DSA_print_fp 278 1_1_0 EXIST::FUNCTION:DSA,STDIO
X509_get_ext_d2i 279 1_1_0 EXIST::FUNCTION:
@@ -319,7 +319,7 @@ EVP_CIPHER_CTX_set_flags 314 1_1_0 EXIST::FUNCTION:
err_free_strings_int 315 1_1_0 EXIST::FUNCTION:
PEM_write_bio_PKCS7_stream 316 1_1_0 EXIST::FUNCTION:
d2i_X509_CERT_AUX 317 1_1_0 EXIST::FUNCTION:
-UI_process 318 1_1_0 EXIST::FUNCTION:
+UI_process 318 1_1_0 EXIST::FUNCTION:UI
X509_get_subject_name 319 1_1_0 EXIST::FUNCTION:
DH_get_1024_160 320 1_1_0 EXIST::FUNCTION:DH
i2d_ASN1_UNIVERSALSTRING 321 1_1_0 EXIST::FUNCTION:
@@ -336,7 +336,7 @@ CRYPTO_ccm128_tag 331 1_1_0 EXIST::FUNCTION:
BIO_new_dgram_sctp 332 1_1_0 EXIST::FUNCTION:DGRAM,SCTP
d2i_RSAPrivateKey_fp 333 1_1_0 EXIST::FUNCTION:RSA,STDIO
s2i_ASN1_IA5STRING 334 1_1_0 EXIST::FUNCTION:
-UI_get_ex_data 335 1_1_0 EXIST::FUNCTION:
+UI_get_ex_data 335 1_1_0 EXIST::FUNCTION:UI
EVP_EncryptUpdate 336 1_1_0 EXIST::FUNCTION:
SRP_create_verifier 337 1_1_0 EXIST::FUNCTION:SRP
TS_TST_INFO_print_bio 338 1_1_0 EXIST::FUNCTION:TS
@@ -378,7 +378,7 @@ SEED_ecb_encrypt 370 1_1_0 EXIST::FUNCTION:SEED
X509_PUBKEY_get0_param 371 1_1_0 EXIST::FUNCTION:
ASN1_i2d_fp 372 1_1_0 EXIST::FUNCTION:STDIO
BIO_new_mem_buf 373 1_1_0 EXIST::FUNCTION:
-UI_get_input_flags 374 1_1_0 EXIST::FUNCTION:
+UI_get_input_flags 374 1_1_0 EXIST::FUNCTION:UI
X509V3_EXT_REQ_add_nconf 375 1_1_0 EXIST::FUNCTION:
X509v3_asid_subset 376 1_1_0 EXIST::FUNCTION:RFC3779
RSA_check_key_ex 377 1_1_0 EXIST::FUNCTION:RSA
@@ -501,7 +501,7 @@ BN_GF2m_mod_sqr_arr 492 1_1_0 EXIST::FUNCTION:EC2M
ASN1_PRINTABLESTRING_it 493 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
ASN1_PRINTABLESTRING_it 493 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
BIO_f_cipher 494 1_1_0 EXIST::FUNCTION:
-UI_destroy_method 495 1_1_0 EXIST::FUNCTION:
+UI_destroy_method 495 1_1_0 EXIST::FUNCTION:UI
BN_get_rfc3526_prime_3072 496 1_1_0 EXIST::FUNCTION:
X509_INFO_new 497 1_1_0 EXIST::FUNCTION:
OCSP_RESPDATA_it 498 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -640,7 +640,7 @@ CRYPTO_secure_malloc_done 625 1_1_0 EXIST::FUNCTION:
RSA_OAEP_PARAMS_new 626 1_1_0 EXIST::FUNCTION:RSA
X509_NAME_free 627 1_1_0 EXIST::FUNCTION:
PKCS12_set_mac 628 1_1_0 EXIST::FUNCTION:
-UI_get0_result_string 629 1_1_0 EXIST::FUNCTION:
+UI_get0_result_string 629 1_1_0 EXIST::FUNCTION:UI
TS_RESP_CTX_add_policy 630 1_1_0 EXIST::FUNCTION:TS
X509_REQ_dup 631 1_1_0 EXIST::FUNCTION:
CRYPTO_get_add_lock_callback 632 1_1_0 NOEXIST::FUNCTION:
@@ -655,9 +655,9 @@ CRYPTO_THREAD_write_lock 639 1_1_0 EXIST::FUNCTION:
X509V3_NAME_from_section 640 1_1_0 EXIST::FUNCTION:
EC_POINT_set_compressed_coordinates_GFp 641 1_1_0 EXIST::FUNCTION:EC
OCSP_SINGLERESP_get0_id 642 1_1_0 EXIST::FUNCTION:
-UI_add_info_string 643 1_1_0 EXIST::FUNCTION:
+UI_add_info_string 643 1_1_0 EXIST::FUNCTION:UI
OBJ_NAME_remove 644 1_1_0 EXIST::FUNCTION:
-UI_get_method 645 1_1_0 EXIST::FUNCTION:
+UI_get_method 645 1_1_0 EXIST::FUNCTION:UI
CONF_modules_unload 646 1_1_0 EXIST::FUNCTION:
CRYPTO_ccm128_encrypt_ccm64 647 1_1_0 EXIST::FUNCTION:
CRYPTO_secure_malloc_init 648 1_1_0 EXIST::FUNCTION:
@@ -734,7 +734,7 @@ PKCS7_add_signature 716 1_1_0 EXIST::FUNCTION:
OBJ_ln2nid 717 1_1_0 EXIST::FUNCTION:
CRYPTO_128_unwrap 718 1_1_0 EXIST::FUNCTION:
BIO_new_PKCS7 719 1_1_0 EXIST::FUNCTION:
-UI_get0_user_data 720 1_1_0 EXIST::FUNCTION:
+UI_get0_user_data 720 1_1_0 EXIST::FUNCTION:UI
TS_RESP_get_token 721 1_1_0 EXIST::FUNCTION:TS
OCSP_RESPID_new 722 1_1_0 EXIST::FUNCTION:
ASN1_SET_ANY_it 723 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -777,7 +777,7 @@ X509_policy_node_get0_qualifiers 758 1_1_0 EXIST::FUNCTION:
OCSP_cert_status_str 759 1_1_0 EXIST::FUNCTION:
EVP_MD_meth_get_flags 760 1_1_0 EXIST::FUNCTION:
ASN1_ENUMERATED_set 761 1_1_0 EXIST::FUNCTION:
-UI_UTIL_read_pw 762 1_1_0 EXIST::FUNCTION:
+UI_UTIL_read_pw 762 1_1_0 EXIST::FUNCTION:UI
PKCS7_ENC_CONTENT_free 763 1_1_0 EXIST::FUNCTION:
CMS_RecipientInfo_type 764 1_1_0 EXIST::FUNCTION:CMS
OCSP_BASICRESP_get_ext 765 1_1_0 EXIST::FUNCTION:
@@ -789,7 +789,7 @@ ENGINE_init 770 1_1_0 EXIST::FUNCTION:ENGINE
TS_RESP_CTX_add_flags 771 1_1_0 EXIST::FUNCTION:TS
BIO_gethostbyname 772 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0,SOCK
X509V3_EXT_add 773 1_1_0 EXIST::FUNCTION:
-UI_add_verify_string 774 1_1_0 EXIST::FUNCTION:
+UI_add_verify_string 774 1_1_0 EXIST::FUNCTION:UI
EVP_rc5_32_12_16_cfb64 775 1_1_0 EXIST::FUNCTION:RC5
PKCS7_dataVerify 776 1_1_0 EXIST::FUNCTION:
PKCS7_SIGNER_INFO_free 777 1_1_0 EXIST::FUNCTION:
@@ -935,7 +935,7 @@ DES_encrypt1 911 1_1_0 EXIST::FUNCTION:DES
BN_mod_lshift1_quick 912 1_1_0 EXIST::FUNCTION:
BN_get_rfc3526_prime_6144 913 1_1_0 EXIST::FUNCTION:
OBJ_obj2txt 914 1_1_0 EXIST::FUNCTION:
-UI_set_result 915 1_1_0 EXIST::FUNCTION:
+UI_set_result 915 1_1_0 EXIST::FUNCTION:UI
EVP_EncodeUpdate 916 1_1_0 EXIST::FUNCTION:
PEM_write_bio_X509_CRL 917 1_1_0 EXIST::FUNCTION:
BN_cmp 918 1_1_0 EXIST::FUNCTION:
@@ -1043,12 +1043,12 @@ ASN1_UTCTIME_it 1013 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:
i2d_DSA_PUBKEY_fp 1014 1_1_0 EXIST::FUNCTION:DSA,STDIO
X509at_get_attr_by_OBJ 1015 1_1_0 EXIST::FUNCTION:
EVP_MD_CTX_copy_ex 1016 1_1_0 EXIST::FUNCTION:
-UI_dup_error_string 1017 1_1_0 EXIST::FUNCTION:
+UI_dup_error_string 1017 1_1_0 EXIST::FUNCTION:UI
lh_num_items 1018 1_1_0 EXIST::FUNCTION:
ERR_get_err_state_table 1019 1_1_0 NOEXIST::FUNCTION:
ASN1_INTEGER_cmp 1020 1_1_0 EXIST::FUNCTION:
X509_NAME_entry_count 1021 1_1_0 EXIST::FUNCTION:
-UI_method_set_closer 1022 1_1_0 EXIST::FUNCTION:
+UI_method_set_closer 1022 1_1_0 EXIST::FUNCTION:UI
lh_get_down_load 1023 1_1_0 EXIST::FUNCTION:
EVP_md4 1024 1_1_0 EXIST::FUNCTION:MD4
X509_set_subject_name 1025 1_1_0 EXIST::FUNCTION:
@@ -1125,7 +1125,7 @@ X509_print_ex_fp 1093 1_1_0 EXIST::FUNCTION:STDIO
ERR_load_PEM_strings 1094 1_1_0 EXIST::FUNCTION:
ENGINE_unregister_pkey_asn1_meths 1095 1_1_0 EXIST::FUNCTION:ENGINE
IPAddressFamily_free 1096 1_1_0 EXIST::FUNCTION:RFC3779
-UI_method_get_prompt_constructor 1097 1_1_0 EXIST::FUNCTION:
+UI_method_get_prompt_constructor 1097 1_1_0 EXIST::FUNCTION:UI
ASN1_NULL_it 1098 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
ASN1_NULL_it 1098 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
X509_REQ_get_pubkey 1099 1_1_0 EXIST::FUNCTION:
@@ -1288,7 +1288,7 @@ OPENSSL_DIR_read 1250 1_1_0 EXIST::FUNCTION:
CMS_add_smimecap 1251 1_1_0 EXIST::FUNCTION:CMS
X509_check_email 1252 1_1_0 EXIST::FUNCTION:
CRYPTO_cts128_decrypt_block 1253 1_1_0 EXIST::FUNCTION:
-UI_method_get_opener 1254 1_1_0 EXIST::FUNCTION:
+UI_method_get_opener 1254 1_1_0 EXIST::FUNCTION:UI
EVP_aes_192_gcm 1255 1_1_0 EXIST::FUNCTION:
TS_CONF_set_tsa_name 1256 1_1_0 EXIST::FUNCTION:TS
X509_email_free 1257 1_1_0 EXIST::FUNCTION:
@@ -1319,7 +1319,7 @@ ASN1_TIME_free 1281 1_1_0 EXIST::FUNCTION:
i2o_SCT_LIST 1282 1_1_0 EXIST::FUNCTION:CT
AES_encrypt 1283 1_1_0 EXIST::FUNCTION:
MD5_Init 1284 1_1_0 EXIST::FUNCTION:MD5
-UI_add_error_string 1285 1_1_0 EXIST::FUNCTION:
+UI_add_error_string 1285 1_1_0 EXIST::FUNCTION:UI
X509_TRUST_cleanup 1286 1_1_0 EXIST::FUNCTION:
PEM_read_X509 1287 1_1_0 EXIST::FUNCTION:
EC_KEY_new_method 1288 1_1_0 EXIST::FUNCTION:EC
@@ -1342,11 +1342,11 @@ BN_rshift1 1303 1_1_0 EXIST::FUNCTION:
i2d_PKCS7_ENVELOPE 1304 1_1_0 EXIST::FUNCTION:
PBKDF2PARAM_it 1305 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
PBKDF2PARAM_it 1305 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-UI_get_result_maxsize 1306 1_1_0 EXIST::FUNCTION:
+UI_get_result_maxsize 1306 1_1_0 EXIST::FUNCTION:UI
PBEPARAM_it 1307 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
PBEPARAM_it 1307 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
TS_ACCURACY_set_seconds 1308 1_1_0 EXIST::FUNCTION:TS
-UI_get0_action_string 1309 1_1_0 EXIST::FUNCTION:
+UI_get0_action_string 1309 1_1_0 EXIST::FUNCTION:UI
RC2_decrypt 1310 1_1_0 EXIST::FUNCTION:RC2
OPENSSL_atexit 1311 1_1_0 EXIST::FUNCTION:
CMS_add_standard_smimecap 1312 1_1_0 EXIST::FUNCTION:CMS
@@ -1421,7 +1421,7 @@ PROXY_CERT_INFO_EXTENSION_it 1377 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:
CT_POLICY_EVAL_CTX_set0_cert 1378 1_1_0 EXIST::FUNCTION:CT
X509_NAME_hash 1379 1_1_0 EXIST::FUNCTION:
SCT_set_timestamp 1380 1_1_0 EXIST::FUNCTION:CT
-UI_new 1381 1_1_0 EXIST::FUNCTION:
+UI_new 1381 1_1_0 EXIST::FUNCTION:UI
TS_REQ_get_msg_imprint 1382 1_1_0 EXIST::FUNCTION:TS
i2d_PKCS12_BAGS 1383 1_1_0 EXIST::FUNCTION:
RSA_memory_lock 1384 1_1_0 EXIST::FUNCTION:RSA
@@ -1442,7 +1442,7 @@ PEM_read_bio_PrivateKey 1398 1_1_0 EXIST::FUNCTION:
d2i_PKCS7_ENCRYPT 1399 1_1_0 EXIST::FUNCTION:
EVP_PKEY_CTX_ctrl 1400 1_1_0 EXIST::FUNCTION:
X509_REQ_set_pubkey 1401 1_1_0 EXIST::FUNCTION:
-UI_create_method 1402 1_1_0 EXIST::FUNCTION:
+UI_create_method 1402 1_1_0 EXIST::FUNCTION:UI
X509_REQ_add_extensions_nid 1403 1_1_0 EXIST::FUNCTION:
PEM_X509_INFO_write_bio 1404 1_1_0 EXIST::FUNCTION:
BIO_dump_cb 1405 1_1_0 EXIST::FUNCTION:
@@ -1524,7 +1524,7 @@ SHA384_Final 1478 1_1_0 EXIST:!VMSVAX:FUNCTION:
TS_RESP_CTX_set_certs 1479 1_1_0 EXIST::FUNCTION:TS
BN_MONT_CTX_free 1480 1_1_0 EXIST::FUNCTION:
BN_GF2m_mod_solve_quad_arr 1481 1_1_0 EXIST::FUNCTION:EC2M
-UI_add_input_string 1482 1_1_0 EXIST::FUNCTION:
+UI_add_input_string 1482 1_1_0 EXIST::FUNCTION:UI
TS_TST_INFO_get_version 1483 1_1_0 EXIST::FUNCTION:TS
BIO_accept_ex 1484 1_1_0 EXIST::FUNCTION:SOCK
CRYPTO_get_mem_functions 1485 1_1_0 EXIST::FUNCTION:
@@ -1634,7 +1634,7 @@ SRP_Verify_A_mod_N 1587 1_1_0 EXIST::FUNCTION:SRP
SRP_VBASE_free 1588 1_1_0 EXIST::FUNCTION:SRP
PKCS7_add0_attrib_signing_time 1589 1_1_0 EXIST::FUNCTION:
X509_STORE_set_flags 1590 1_1_0 EXIST::FUNCTION:
-UI_get0_output_string 1591 1_1_0 EXIST::FUNCTION:
+UI_get0_output_string 1591 1_1_0 EXIST::FUNCTION:UI
ERR_get_error_line_data 1592 1_1_0 EXIST::FUNCTION:
CTLOG_get0_name 1593 1_1_0 EXIST::FUNCTION:CT
ASN1_TBOOLEAN_it 1594 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -1737,7 +1737,7 @@ CMS_EncryptedData_set1_key 1686 1_1_0 EXIST::FUNCTION:CMS
OBJ_find_sigid_by_algs 1687 1_1_0 EXIST::FUNCTION:
ASN1_generate_nconf 1688 1_1_0 EXIST::FUNCTION:
CMS_add0_recipient_password 1689 1_1_0 EXIST::FUNCTION:CMS
-UI_get_string_type 1690 1_1_0 EXIST::FUNCTION:
+UI_get_string_type 1690 1_1_0 EXIST::FUNCTION:UI
PEM_read_bio_ECPrivateKey 1691 1_1_0 EXIST::FUNCTION:EC
EVP_PKEY_get_attr 1692 1_1_0 EXIST::FUNCTION:
PEM_read_bio_ECPKParameters 1693 1_1_0 EXIST::FUNCTION:EC
@@ -1758,7 +1758,7 @@ X509_policy_tree_get0_level 1706 1_1_0 EXIST::FUNCTION:
ASN1_parse_dump 1708 1_1_0 EXIST::FUNCTION:
BIO_vfree 1709 1_1_0 EXIST::FUNCTION:
CRYPTO_cbc128_decrypt 1710 1_1_0 EXIST::FUNCTION:
-UI_dup_verify_string 1711 1_1_0 EXIST::FUNCTION:
+UI_dup_verify_string 1711 1_1_0 EXIST::FUNCTION:UI
d2i_PKCS7_bio 1712 1_1_0 EXIST::FUNCTION:
ENGINE_set_default_digests 1713 1_1_0 EXIST::FUNCTION:ENGINE
i2d_PublicKey 1714 1_1_0 EXIST::FUNCTION:
@@ -1776,7 +1776,7 @@ BIO_nwrite0 1725 1_1_0 EXIST::FUNCTION:
CAST_encrypt 1726 1_1_0 EXIST::FUNCTION:CAST
a2d_ASN1_OBJECT 1727 1_1_0 EXIST::FUNCTION:
OCSP_ONEREQ_delete_ext 1728 1_1_0 EXIST::FUNCTION:
-UI_method_get_reader 1729 1_1_0 EXIST::FUNCTION:
+UI_method_get_reader 1729 1_1_0 EXIST::FUNCTION:UI
CMS_unsigned_get_attr 1730 1_1_0 EXIST::FUNCTION:CMS
EVP_aes_256_cbc 1731 1_1_0 EXIST::FUNCTION:
X509_check_ip_asc 1732 1_1_0 EXIST::FUNCTION:
@@ -1908,7 +1908,7 @@ TS_RESP_CTX_set_serial_cb 1851 1_1_0 EXIST::FUNCTION:TS
POLICY_MAPPING_it 1852 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
POLICY_MAPPING_it 1852 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
ERR_load_KDF_strings 1853 1_1_0 EXIST::FUNCTION:
-UI_method_set_reader 1854 1_1_0 EXIST::FUNCTION:
+UI_method_set_reader 1854 1_1_0 EXIST::FUNCTION:UI
BIO_next 1855 1_1_0 EXIST::FUNCTION:
ASN1_STRING_set_default_mask_asc 1856 1_1_0 EXIST::FUNCTION:
X509_CRL_new 1857 1_1_0 EXIST::FUNCTION:
@@ -1955,7 +1955,7 @@ EVP_aes_192_cfb128 1896 1_1_0 EXIST::FUNCTION:
OCSP_REQ_CTX_nbio 1897 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_copy 1898 1_1_0 EXIST::FUNCTION:
CRYPTO_secure_allocated 1899 1_1_0 EXIST::FUNCTION:
-UI_UTIL_read_pw_string 1900 1_1_0 EXIST::FUNCTION:
+UI_UTIL_read_pw_string 1900 1_1_0 EXIST::FUNCTION:UI
NOTICEREF_free 1901 1_1_0 EXIST::FUNCTION:
AES_cfb1_encrypt 1902 1_1_0 EXIST::FUNCTION:
X509v3_get_ext 1903 1_1_0 EXIST::FUNCTION:
@@ -2009,7 +2009,7 @@ PKCS12_unpack_p7data 1951 1_1_0 EXIST::FUNCTION:
ECDSA_sign 1952 1_1_0 EXIST::FUNCTION:EC
d2i_PKCS12_fp 1953 1_1_0 EXIST::FUNCTION:
CMS_unsigned_get_attr_by_NID 1954 1_1_0 EXIST::FUNCTION:CMS
-UI_add_user_data 1955 1_1_0 EXIST::FUNCTION:
+UI_add_user_data 1955 1_1_0 EXIST::FUNCTION:UI
BN_bntest_rand 1956 1_1_0 EXIST::FUNCTION:
X509_get_pubkey 1957 1_1_0 EXIST::FUNCTION:
i2d_X509_NAME 1958 1_1_0 EXIST::FUNCTION:
@@ -2075,7 +2075,7 @@ EC_POINT_point2hex 2013 1_1_0 EXIST::FUNCTION:EC
ENGINE_get_default_DSA 2014 1_1_0 EXIST::FUNCTION:ENGINE
ENGINE_register_all_complete 2015 1_1_0 EXIST::FUNCTION:ENGINE
SRP_get_default_gN 2016 1_1_0 EXIST::FUNCTION:SRP
-UI_dup_input_boolean 2017 1_1_0 EXIST::FUNCTION:
+UI_dup_input_boolean 2017 1_1_0 EXIST::FUNCTION:UI
PKCS7_dup 2018 1_1_0 EXIST::FUNCTION:
i2d_TS_REQ_fp 2019 1_1_0 EXIST::FUNCTION:STDIO,TS
i2d_OTHERNAME 2020 1_1_0 EXIST::FUNCTION:
@@ -2088,9 +2088,9 @@ ENGINE_get_pkey_asn1_meth_str 2026 1_1_0 EXIST::FUNCTION:ENGINE
PKCS7_signatureVerify 2027 1_1_0 EXIST::FUNCTION:
CRYPTO_ocb128_new 2028 1_1_0 EXIST::FUNCTION:OCB
EC_curve_nist2nid 2029 1_1_0 EXIST::FUNCTION:EC
-UI_get0_result 2030 1_1_0 EXIST::FUNCTION:
+UI_get0_result 2030 1_1_0 EXIST::FUNCTION:UI
OCSP_request_add1_nonce 2031 1_1_0 EXIST::FUNCTION:
-UI_construct_prompt 2032 1_1_0 EXIST::FUNCTION:
+UI_construct_prompt 2032 1_1_0 EXIST::FUNCTION:UI
ENGINE_unregister_RSA 2033 1_1_0 EXIST::FUNCTION:ENGINE
EC_GROUP_order_bits 2034 1_1_0 EXIST::FUNCTION:EC
d2i_CMS_bio 2035 1_1_0 EXIST::FUNCTION:CMS
@@ -2119,10 +2119,10 @@ EVP_CIPHER_CTX_original_iv 2054 1_1_0 EXIST::FUNCTION:
PKCS7_SIGNED_free 2055 1_1_0 EXIST::FUNCTION:
X509_TRUST_get0_name 2056 1_1_0 EXIST::FUNCTION:
ENGINE_get_load_pubkey_function 2057 1_1_0 EXIST::FUNCTION:ENGINE
-UI_get_default_method 2058 1_1_0 EXIST::FUNCTION:
+UI_get_default_method 2058 1_1_0 EXIST::FUNCTION:UI
PKCS12_add_CSPName_asc 2059 1_1_0 EXIST::FUNCTION:
PEM_write_PUBKEY 2060 1_1_0 EXIST::FUNCTION:
-UI_method_set_prompt_constructor 2061 1_1_0 EXIST::FUNCTION:
+UI_method_set_prompt_constructor 2061 1_1_0 EXIST::FUNCTION:UI
OBJ_length 2062 1_1_0 EXIST::FUNCTION:
BN_GENCB_get_arg 2063 1_1_0 EXIST::FUNCTION:
EVP_MD_CTX_clear_flags 2064 1_1_0 EXIST::FUNCTION:
@@ -2150,7 +2150,7 @@ i2d_ASN1_GENERALSTRING 2085 1_1_0 EXIST::FUNCTION:
POLICYQUALINFO_new 2086 1_1_0 EXIST::FUNCTION:
PKCS7_RECIP_INFO_get0_alg 2087 1_1_0 EXIST::FUNCTION:
EVP_PKEY_base_id 2088 1_1_0 EXIST::FUNCTION:
-UI_method_set_opener 2089 1_1_0 EXIST::FUNCTION:
+UI_method_set_opener 2089 1_1_0 EXIST::FUNCTION:UI
X509v3_get_ext_by_NID 2090 1_1_0 EXIST::FUNCTION:
TS_CONF_set_policies 2091 1_1_0 EXIST::FUNCTION:TS
CMS_SignerInfo_cert_cmp 2092 1_1_0 EXIST::FUNCTION:CMS
@@ -2414,7 +2414,7 @@ ASN1_PRINTABLE_type 2338 1_1_0 EXIST::FUNCTION:
TS_CONF_set_ess_cert_id_chain 2339 1_1_0 EXIST::FUNCTION:TS
PEM_read_DSAPrivateKey 2340 1_1_0 EXIST::FUNCTION:DSA
DH_generate_parameters_ex 2341 1_1_0 EXIST::FUNCTION:DH
-UI_dup_input_string 2342 1_1_0 EXIST::FUNCTION:
+UI_dup_input_string 2342 1_1_0 EXIST::FUNCTION:UI
X509_keyid_set1 2343 1_1_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_set1 2344 1_1_0 EXIST::FUNCTION:
EC_GROUP_get_asn1_flag 2345 1_1_0 EXIST::FUNCTION:EC
@@ -2492,7 +2492,7 @@ BIO_ctrl 2414 1_1_0 EXIST::FUNCTION:
X509_CRL_set_default_method 2415 1_1_0 EXIST::FUNCTION:
DSO_pathbyaddr 2416 1_1_0 NOEXIST::FUNCTION:
d2i_RSAPublicKey_fp 2417 1_1_0 EXIST::FUNCTION:RSA,STDIO
-UI_method_get_flusher 2418 1_1_0 EXIST::FUNCTION:
+UI_method_get_flusher 2418 1_1_0 EXIST::FUNCTION:UI
EC_POINT_dbl 2419 1_1_0 EXIST::FUNCTION:EC
i2d_X509_CRL_INFO 2420 1_1_0 EXIST::FUNCTION:
i2d_OCSP_CERTSTATUS 2421 1_1_0 EXIST::FUNCTION:
@@ -2621,7 +2621,7 @@ PKCS7_ENVELOPE_free 2538 1_1_0 EXIST::FUNCTION:
PKCS12_key_gen_uni 2539 1_1_0 EXIST::FUNCTION:
WHIRLPOOL 2540 1_1_0 EXIST::FUNCTION:WHIRLPOOL
a2i_ipadd 2541 1_1_0 EXIST::FUNCTION:
-UI_set_default_method 2542 1_1_0 EXIST::FUNCTION:
+UI_set_default_method 2542 1_1_0 EXIST::FUNCTION:UI
EC_POINT_is_at_infinity 2543 1_1_0 EXIST::FUNCTION:EC
i2d_NOTICEREF 2544 1_1_0 EXIST::FUNCTION:
EC_KEY_new 2545 1_1_0 EXIST::FUNCTION:EC
@@ -2848,8 +2848,8 @@ CT_POLICY_EVAL_CTX_new 2756 1_1_0 EXIST::FUNCTION:CT
NETSCAPE_SPKI_it 2757 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
NETSCAPE_SPKI_it 2757 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
CRYPTO_THREAD_unlock 2758 1_1_0 EXIST::FUNCTION:
-UI_method_set_writer 2759 1_1_0 EXIST::FUNCTION:
-UI_dup_info_string 2760 1_1_0 EXIST::FUNCTION:
+UI_method_set_writer 2759 1_1_0 EXIST::FUNCTION:UI
+UI_dup_info_string 2760 1_1_0 EXIST::FUNCTION:UI
OPENSSL_init 2761 1_1_0 EXIST::FUNCTION:
TS_RESP_get_tst_info 2762 1_1_0 EXIST::FUNCTION:TS
X509_VERIFY_PARAM_get_depth 2763 1_1_0 EXIST::FUNCTION:
@@ -3297,7 +3297,7 @@ RSAPrivateKey_dup 3188 1_1_0 EXIST::FUNCTION:RSA
BN_mod_add 3189 1_1_0 EXIST::FUNCTION:
EC_POINT_set_affine_coordinates_GFp 3190 1_1_0 EXIST::FUNCTION:EC
X509_get_default_cert_file 3191 1_1_0 EXIST::FUNCTION:
-UI_method_set_flusher 3192 1_1_0 EXIST::FUNCTION:
+UI_method_set_flusher 3192 1_1_0 EXIST::FUNCTION:UI
RSA_new_method 3193 1_1_0 EXIST::FUNCTION:RSA
OCSP_request_verify 3194 1_1_0 EXIST::FUNCTION:
CRYPTO_THREAD_run_once 3195 1_1_0 EXIST::FUNCTION:
@@ -3531,7 +3531,7 @@ ASN1_mbstring_copy 3417 1_1_0 EXIST::FUNCTION:
PKCS7_set_type 3418 1_1_0 EXIST::FUNCTION:
BIO_gets 3419 1_1_0 EXIST::FUNCTION:
RSA_padding_check_PKCS1_type_1 3420 1_1_0 EXIST::FUNCTION:RSA
-UI_ctrl 3421 1_1_0 EXIST::FUNCTION:
+UI_ctrl 3421 1_1_0 EXIST::FUNCTION:UI
i2d_X509_REQ_fp 3422 1_1_0 EXIST::FUNCTION:STDIO
BN_BLINDING_convert_ex 3423 1_1_0 EXIST::FUNCTION:
ASN1_GENERALIZEDTIME_print 3424 1_1_0 EXIST::FUNCTION:
@@ -3544,7 +3544,7 @@ OCSP_SINGLERESP_get_ext_count 3430 1_1_0 EXIST::FUNCTION:
EC_POINT_free 3431 1_1_0 EXIST::FUNCTION:EC
EVP_OpenFinal 3432 1_1_0 EXIST::FUNCTION:RSA
RAND_egd_bytes 3433 1_1_0 EXIST::FUNCTION:EGD
-UI_method_get_writer 3434 1_1_0 EXIST::FUNCTION:
+UI_method_get_writer 3434 1_1_0 EXIST::FUNCTION:UI
BN_secure_new 3435 1_1_0 EXIST::FUNCTION:
CTLOG_new_null 3436 1_1_0 EXIST::FUNCTION:CT
SHA1_Update 3437 1_1_0 EXIST::FUNCTION:
@@ -3713,7 +3713,7 @@ RAND_bytes 3596 1_1_0 EXIST::FUNCTION:
PKCS7_free 3597 1_1_0 EXIST::FUNCTION:
X509_NAME_ENTRY_create_by_txt 3598 1_1_0 EXIST::FUNCTION:
DES_cbc_cksum 3599 1_1_0 EXIST::FUNCTION:DES
-UI_free 3600 1_1_0 EXIST::FUNCTION:
+UI_free 3600 1_1_0 EXIST::FUNCTION:UI
BN_is_prime 3601 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_0_9_8
CMS_get0_signers 3602 1_1_0 EXIST::FUNCTION:CMS
i2d_PrivateKey_fp 3603 1_1_0 EXIST::FUNCTION:STDIO
@@ -3736,7 +3736,7 @@ TS_CONF_set_signer_digest 3619 1_1_0 EXIST::FUNCTION:TS
OBJ_new_nid 3620 1_1_0 EXIST::FUNCTION:
CMS_ReceiptRequest_new 3621 1_1_0 EXIST::FUNCTION:CMS
SRP_VBASE_get1_by_user 3622 1_1_0 EXIST::FUNCTION:SRP
-UI_method_get_closer 3623 1_1_0 EXIST::FUNCTION:
+UI_method_get_closer 3623 1_1_0 EXIST::FUNCTION:UI
ENGINE_get_ex_data 3624 1_1_0 EXIST::FUNCTION:ENGINE
BN_print_fp 3625 1_1_0 EXIST::FUNCTION:STDIO
MD2_Update 3626 1_1_0 EXIST::FUNCTION:MD2
@@ -3832,7 +3832,7 @@ ENGINE_register_all_digests 3713 1_1_0 EXIST::FUNCTION:ENGINE
X509_REQ_get_version 3714 1_1_0 EXIST::FUNCTION:
i2d_ASN1_UTCTIME 3715 1_1_0 EXIST::FUNCTION:
TS_STATUS_INFO_new 3716 1_1_0 EXIST::FUNCTION:TS
-UI_set_ex_data 3717 1_1_0 EXIST::FUNCTION:
+UI_set_ex_data 3717 1_1_0 EXIST::FUNCTION:UI
ASN1_TIME_set 3718 1_1_0 EXIST::FUNCTION:
TS_RESP_verify_response 3719 1_1_0 EXIST::FUNCTION:TS
X509_REVOKED_get0_serialNumber 3720 1_1_0 EXIST::FUNCTION:
@@ -3869,7 +3869,7 @@ EVP_PKEY_meth_get_sign 3750 1_1_0 EXIST::FUNCTION:
TS_REQ_get_nonce 3751 1_1_0 EXIST::FUNCTION:TS
ENGINE_unregister_EC 3752 1_1_0 EXIST::FUNCTION:ENGINE
X509v3_get_ext_count 3753 1_1_0 EXIST::FUNCTION:
-UI_OpenSSL 3754 1_1_0 EXIST::FUNCTION:
+UI_OpenSSL 3754 1_1_0 EXIST::FUNCTION:UI
CRYPTO_ccm128_decrypt 3755 1_1_0 EXIST::FUNCTION:
d2i_OCSP_RESPDATA 3756 1_1_0 EXIST::FUNCTION:
BIO_set_callback 3757 1_1_0 EXIST::FUNCTION:
@@ -3900,7 +3900,7 @@ RSA_PSS_PARAMS_it 3779 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:
X509_STORE_CTX_get_error_depth 3780 1_1_0 EXIST::FUNCTION:
ASN1_GENERALIZEDTIME_set_string 3781 1_1_0 EXIST::FUNCTION:
EC_GROUP_new_curve_GFp 3782 1_1_0 EXIST::FUNCTION:EC
-UI_new_method 3783 1_1_0 EXIST::FUNCTION:
+UI_new_method 3783 1_1_0 EXIST::FUNCTION:UI
Camellia_ofb128_encrypt 3784 1_1_0 EXIST::FUNCTION:CAMELLIA
X509_new 3785 1_1_0 EXIST::FUNCTION:
EC_KEY_get_conv_form 3786 1_1_0 EXIST::FUNCTION:EC