summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-04-07 20:19:16 +0200
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-04-07 20:41:34 +0200
commita4ccf06808422400a6a0673b452d388e95a455fd (patch)
tree5bdf041c027ea1b09f103727f9eb9430bc1cf9ac /util
parentSuppress CT callback as appropriate (diff)
downloadopenssl-a4ccf06808422400a6a0673b452d388e95a455fd.tar.xz
openssl-a4ccf06808422400a6a0673b452d388e95a455fd.zip
make update
Signed-off-by: Rob Percival <robpercival@google.com> Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num3
-rw-r--r--util/libssl.num6
2 files changed, 5 insertions, 4 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 5cbdfcc690..2d4c0e67b7 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -238,7 +238,6 @@ EVP_PKEY_meth_set_decrypt 233 1_1_0 EXIST::FUNCTION:
EVP_rc2_ecb 234 1_1_0 EXIST::FUNCTION:RC2
i2b_PublicKey_bio 235 1_1_0 EXIST::FUNCTION:
d2i_ASN1_SET_ANY 236 1_1_0 EXIST::FUNCTION:
-CT_verify_no_bad_scts 237 1_1_0 EXIST::FUNCTION:CT
ASN1_item_i2d 238 1_1_0 EXIST::FUNCTION:
OCSP_copy_nonce 239 1_1_0 EXIST::FUNCTION:
OBJ_txt2nid 240 1_1_0 EXIST::FUNCTION:
@@ -716,7 +715,6 @@ OPENSSL_isservice 697 1_1_0 EXIST::FUNCTION:
DH_compute_key 698 1_1_0 EXIST::FUNCTION:DH
TS_RESP_CTX_set_signer_key 699 1_1_0 EXIST::FUNCTION:TS
i2d_DSAPrivateKey_bio 700 1_1_0 EXIST::FUNCTION:DSA
-CT_verify_at_least_one_good_sct 701 1_1_0 EXIST::FUNCTION:CT
ASN1_item_d2i 702 1_1_0 EXIST::FUNCTION:
BIO_int_ctrl 703 1_1_0 EXIST::FUNCTION:
CMS_ReceiptRequest_it 704 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS
@@ -1240,6 +1238,7 @@ OBJ_obj2nid 1202 1_1_0 EXIST::FUNCTION:
PKCS12_SAFEBAG_free 1203 1_1_0 EXIST::FUNCTION:
EVP_cast5_cfb64 1204 1_1_0 EXIST::FUNCTION:CAST
OPENSSL_uni2asc 1205 1_1_0 EXIST::FUNCTION:
+SCT_validation_status_string 1206 1_1_0 EXIST::FUNCTION:CT
PKCS7_add_attribute 1207 1_1_0 EXIST::FUNCTION:
ENGINE_register_DSA 1208 1_1_0 EXIST::FUNCTION:ENGINE
lh_node_stats 1209 1_1_0 EXIST::FUNCTION:STDIO
diff --git a/util/libssl.num b/util/libssl.num
index 8b2155ec9f..950ca03913 100644
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -377,10 +377,10 @@ SSL_CTX_set_ctlog_list_file 376 1_1_0 EXIST::FUNCTION:CT
SSL_set_ct_validation_callback 377 1_1_0 EXIST::FUNCTION:CT
SSL_CTX_set_default_ctlog_list_file 378 1_1_0 EXIST::FUNCTION:CT
SSL_CTX_has_client_custom_ext 379 1_1_0 EXIST::FUNCTION:
-SSL_get_ct_validation_callback 380 1_1_0 EXIST::FUNCTION:CT
+SSL_ct_is_enabled 380 1_1_0 EXIST::FUNCTION:CT
SSL_get0_peer_scts 381 1_1_0 EXIST::FUNCTION:CT
SSL_CTX_set_ct_validation_callback 382 1_1_0 EXIST::FUNCTION:CT
-SSL_CTX_get_ct_validation_callback 383 1_1_0 EXIST::FUNCTION:CT
+SSL_CTX_ct_is_enabled 383 1_1_0 EXIST::FUNCTION:CT
SSL_set_default_read_buffer_len 384 1_1_0 EXIST::FUNCTION:
SSL_CTX_set_default_read_buffer_len 385 1_1_0 EXIST::FUNCTION:
SSL_has_pending 386 1_1_0 EXIST::FUNCTION:
@@ -390,3 +390,5 @@ SSL_CIPHER_is_aead 389 1_1_0 EXIST::FUNCTION:
SSL_SESSION_up_ref 390 1_1_0 EXIST::FUNCTION:
SSL_CTX_set0_ctlog_store 391 1_1_0 EXIST::FUNCTION:CT
SSL_CTX_get0_ctlog_store 392 1_1_0 EXIST::FUNCTION:CT
+SSL_enable_ct 393 1_1_0 EXIST::FUNCTION:CT
+SSL_CTX_enable_ct 394 1_1_0 EXIST::FUNCTION:CT