aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-01-05 13:06:03 -0500
committerRich Salz <rsalz@openssl.org>2016-01-13 14:32:59 -0500
commit3aef36ffef89849348049296892327e6fdf9d705 (patch)
treea8a89aedef46029fcd855e4d9ad1d19c279b8483 /util
parent8ffcca65861520fb95e4603b2cb80b3028e56baa (diff)
downloadopenssl-3aef36ffef89849348049296892327e6fdf9d705.tar.gz
Add CRYPTO_EX_DATA; remove EC_EXTRA_DATA
Add CRYPTO_EX_DATA add EndC_KEY_[gs]et_method, From Roumen Petrov. Had to add various exdata calls to init/copy/free the exdata. Had to remove const from some EC functions because exdata isn't const-correct. :( Also remove EC_EXTRA_DATA and use a union to hold the possible pre-computed values and an enum to tell which value is in the union. (Rich Salz) Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/libeay.num14
1 files changed, 9 insertions, 5 deletions
diff --git a/util/libeay.num b/util/libeay.num
index af0520b79f..476334f234 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2947,7 +2947,7 @@ EC_POINT_bn2point 3398 1_1_0 EXIST::FUNCTION:EC
X509_VERIFY_PARAM_set_depth 3399 1_1_0 EXIST::FUNCTION:
EC_KEY_set_asn1_flag 3400 1_1_0 EXIST::FUNCTION:EC
STORE_get_method 3401 1_1_0 NOEXIST::FUNCTION:
-EC_KEY_get_key_method_data 3402 1_1_0 EXIST::FUNCTION:EC
+EC_KEY_get_key_method_data 3402 1_1_0 NOEXIST::FUNCTION:
ECDSA_sign_ex 3403 1_1_0 EXIST::FUNCTION:EC
STORE_parse_attrs_end 3404 1_1_0 NOEXIST::FUNCTION:
EC_GROUP_get_point_conversion_form 3405 1_1_0 EXIST:!VMS:FUNCTION:EC
@@ -3113,7 +3113,7 @@ STORE_meth_set_cleanup_fn 3554 1_1_0 NOEXIST::FUNCTION:
STORE_method_set_cleanup_function 3554 1_1_0 NOEXIST::FUNCTION:
EC_GROUP_check 3555 1_1_0 EXIST::FUNCTION:EC
d2i_ECPrivateKey_bio 3556 1_1_0 EXIST::FUNCTION:EC
-EC_KEY_insert_key_method_data 3557 1_1_0 EXIST::FUNCTION:EC
+EC_KEY_insert_key_method_data 3557 1_1_0 NOEXIST::FUNCTION:
STORE_meth_get_lock_store_fn 3558 1_1_0 NOEXIST::FUNCTION:
STORE_method_get_lock_store_function 3558 1_1_0 NOEXIST::FUNCTION:
X509_VERIFY_PARAM_get_depth 3559 1_1_0 EXIST::FUNCTION:
@@ -4724,13 +4724,17 @@ 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_MDEBUG
CRYPTO_secure_actual_size 5121 1_1_0 EXIST::FUNCTION:
-lh_get_down_load 5122 1_1_0 EXIST::FUNCTION:
-lh_error 5123 1_1_0 EXIST::FUNCTION:
-lh_set_down_load 5124 1_1_0 EXIST::FUNCTION:
+EC_KEY_set_ex_data 5122 1_1_0 EXIST::FUNCTION:EC
+lh_get_down_load 5123 1_1_0 EXIST::FUNCTION:
+EC_KEY_get_ex_data 5124 1_1_0 EXIST::FUNCTION:EC
+EC_KEY_set_method 5125 1_1_0 EXIST::FUNCTION:EC
EVP_CIPHER_CTX_set_num 5125 1_1_0 EXIST::FUNCTION:
+EC_KEY_get_method 5126 1_1_0 EXIST::FUNCTION:EC
EVP_CIPHER_meth_set_init 5126 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_impl_ctx_size 5127 1_1_0 EXIST::FUNCTION:
+lh_error 5127 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_meth_set_cleanup 5128 1_1_0 EXIST::FUNCTION:
+lh_set_down_load 5128 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_meth_free 5129 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_CTX_encrypting 5130 1_1_0 EXIST::FUNCTION:
EVP_CIPHER_meth_set_set_asn1_params 5131 1_1_0 EXIST::FUNCTION: