The branch master has been updated
via 8af6082e16a02b4bad63de99fd3e6bc3501ee2b8 (commit)
from a60994df34fe6a694441471c7f8dcf9661fb091d (commit)
- Log -----------------------------------------------------------------
commit 8af6082e16a02b4bad63de99fd3e6bc3501ee2b8
Author: Richard Levitte <[email protected]>
Date: Sun Sep 6 14:13:00 2015 +0200
Fixup merge conflicts in util/libeay.num
Reviewed-by: Stephen Henson <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
util/libeay.num | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/util/libeay.num b/util/libeay.num
index e5998bc..4e511df 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4587,31 +4587,31 @@ CRYPTO_secure_free 4945
EXIST::FUNCTION:
BIO_s_secmem 4946 EXIST::FUNCTION:
CRYPTO_get_secure_mem_ex_functions 4947 EXIST::FUNCTION:
CRYPTO_set_secure_mem_functions 4948 EXIST::FUNCTION:
-TS_VERIFY_CTX_set_flags 4949 EXIST::FUNCTION:
X509_STORE_CTX_get_num_untrusted 4949 EXIST::FUNCTION:
-TS_STATUS_INFO_set_status 4950 EXIST::FUNCTION:
X509_up_ref 4950 EXIST::FUNCTION:
-TS_VERIFY_CTX_set_imprint 4951 EXIST::FUNCTION:
X509_REQ_get_version 4951 EXIST::FUNCTION:
-TS_VERIFY_CTS_set_certs 4952 EXIST::FUNCTION:
X509_REQ_get_subject_name 4952 EXIST::FUNCTION:
-TS_VERIFY_CTX_set_data 4953 EXIST::FUNCTION:
X509_CRL_up_ref 4953 EXIST::FUNCTION:
CRYPTO_zalloc 4954 EXIST::FUNCTION:
-TS_VERIFY_CTX_set_store 4954 EXIST::FUNCTION:
-X509_get_extension_flags 4954 EXIST::FUNCTION:
-TS_VERIFY_CTX_add_flags 4955 EXIST::FUNCTION:
-X509_get_extended_key_usage 4955 EXIST::FUNCTION:
-X509_get_key_usage 4956 EXIST::FUNCTION:
-X509_CRL_get_issuer 4957 EXIST::FUNCTION:
-X509_CRL_get_nextUpdate 4958 EXIST::FUNCTION:
-X509_CRL_get0_signature 4959 EXIST::FUNCTION:
-X509_CRL_get_REVOKED 4960 EXIST::FUNCTION:
-X509_CRL_get_version 4961 EXIST::FUNCTION:
-X509_CRL_get_lastUpdate 4962 EXIST::FUNCTION:
+X509_get_extension_flags 4955 EXIST::FUNCTION:
+X509_get_extended_key_usage 4956 EXIST::FUNCTION:
+X509_get_key_usage 4957 EXIST::FUNCTION:
+X509_CRL_get_issuer 4958 EXIST::FUNCTION:
+X509_CRL_get_nextUpdate 4959 EXIST::FUNCTION:
+X509_CRL_get0_signature 4960 EXIST::FUNCTION:
+X509_CRL_get_REVOKED 4961 EXIST::FUNCTION:
+X509_CRL_get_version 4962 EXIST::FUNCTION:
+X509_CRL_get_lastUpdate 4963 EXIST::FUNCTION:
EVP_PBE_get 4964 EXIST::FUNCTION:
X509_get_version 4965 EXIST::FUNCTION:
X509_get_X509_PUBKEY 4966 EXIST::FUNCTION:
X509_get_notBefore 4967 EXIST::FUNCTION:
X509_get_notAfter 4968 EXIST::FUNCTION:
X509_get_signature_type 4969 EXIST::FUNCTION:
+TS_VERIFY_CTX_set_data 4970 EXIST::FUNCTION:
+TS_VERIFY_CTX_set_imprint 4971 EXIST::FUNCTION:
+TS_VERIFY_CTX_set_flags 4972 EXIST::FUNCTION:
+TS_VERIFY_CTS_set_certs 4973 EXIST::FUNCTION:
+TS_VERIFY_CTX_add_flags 4974 EXIST::FUNCTION:
+TS_STATUS_INFO_set_status 4975 EXIST::FUNCTION:
+TS_VERIFY_CTX_set_store 4976 EXIST::FUNCTION:
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
