[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed Apr 13 13:23:49 UTC 2016
The branch master has been updated
via 7e74eaa661e05f27a503b3ff3fecc8c94e9e781e (commit)
via 72d3bcd144880d4bbfe0edf2fae211292a1ac2c8 (commit)
via 13524b112ec4d701264884c1c19aa170df41079d (commit)
from e0e532823f1568ef72b3ebc108c38c2cfa44e5aa (commit)
- Log -----------------------------------------------------------------
commit 7e74eaa661e05f27a503b3ff3fecc8c94e9e781e
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Apr 13 15:00:32 2016 +0200
Rename internal symbol to follow internal naming pattern
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 72d3bcd144880d4bbfe0edf2fae211292a1ac2c8
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Apr 13 13:57:46 2016 +0200
Cleanup libcrypto.num and make update
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 13524b112ec4d701264884c1c19aa170df41079d
Author: Richard Levitte <levitte at openssl.org>
Date: Wed Apr 13 13:53:27 2016 +0200
Move a declaration that's private to libcrypto
Don't expose purely libcrypto internal symbols, even to libssl.
Reviewed-by: Matt Caswell <matt at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
test/aborttest.c => crypto/include/internal/err_int.h | 11 +++++------
crypto/init.c | 1 +
engines/e_capi.c | 2 +-
include/internal/err.h | 1 -
util/libcrypto.num | 8 +++-----
util/libssl.num | 2 +-
6 files changed, 11 insertions(+), 14 deletions(-)
copy test/aborttest.c => crypto/include/internal/err_int.h (72%)
diff --git a/test/aborttest.c b/crypto/include/internal/err_int.h
similarity index 72%
copy from test/aborttest.c
copy to crypto/include/internal/err_int.h
index 98aeddf..ad3f7ce 100644
--- a/test/aborttest.c
+++ b/crypto/include/internal/err_int.h
@@ -8,10 +8,9 @@
* or in the file LICENSE in the source distribution.
*/
-#include <openssl/crypto.h>
+#ifndef INTERNAL_ERR_INT_H
+# define INTERNAL_ERR_INT_H
-int main(int argc, char **argv)
-{
- OPENSSL_die("Voluntary abort", __FILE__, __LINE__);
- return 0;
-}
+void err_load_crypto_strings_int(void);
+
+#endif
diff --git a/crypto/init.c b/crypto/init.c
index d9f4000..21dc36d 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -67,6 +67,7 @@
#include <internal/engine.h>
#include <internal/comp.h>
#include <internal/err.h>
+#include <internal/err_int.h>
#include <internal/objects.h>
#include <stdlib.h>
#include <assert.h>
diff --git a/engines/e_capi.c b/engines/e_capi.c
index d2b24d5..5bf0fe9 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -613,7 +613,7 @@ static ENGINE *engine_capi(void)
return ret;
}
-void int_engine_load_capi(void)
+void engine_load_capi_int(void)
{
/* Copied from eng_[openssl|dyn].c */
ENGINE *toadd = engine_capi();
diff --git a/include/internal/err.h b/include/internal/err.h
index f9aa2b2..de2180b 100644
--- a/include/internal/err.h
+++ b/include/internal/err.h
@@ -58,7 +58,6 @@
#ifndef INTERNAL_ERR_H
# define INTERNAL_ERR_H
-void err_load_crypto_strings_int(void);
void err_free_strings_int(void);
#endif
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 2b4d0fb..ded56ee 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -253,7 +253,7 @@ RSA_get_ex_data 249 1_1_0 EXIST::FUNCTION:RSA
EVP_PKEY_meth_get_decrypt 250 1_1_0 EXIST::FUNCTION:
DES_cfb_encrypt 251 1_1_0 EXIST::FUNCTION:DES
CMS_SignerInfo_set1_signer_cert 252 1_1_0 EXIST::FUNCTION:CMS
-X509_CRL_http_nbio 253 1_1_0 EXIST::FUNCTION:
+X509_CRL_http_nbio 253 1_1_0 EXIST::FUNCTION:OCSP
ENGINE_register_all_ciphers 254 1_1_0 EXIST::FUNCTION:ENGINE
SXNET_new 255 1_1_0 EXIST::FUNCTION:
EVP_camellia_256_ctr 256 1_1_0 EXIST::FUNCTION:CAMELLIA
@@ -316,7 +316,7 @@ X509_STORE_CTX_init 311 1_1_0 EXIST::FUNCTION:
OCSP_RESPONSE_free 312 1_1_0 EXIST::FUNCTION:
ENGINE_set_DH 313 1_1_0 EXIST::FUNCTION:ENGINE
EVP_CIPHER_CTX_set_flags 314 1_1_0 EXIST::FUNCTION:
-ERR_free_strings 315 1_1_0 NOEXIST::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:
@@ -1309,7 +1309,7 @@ TS_REQ_set_cert_req 1271 1_1_0 EXIST::FUNCTION:TS
TXT_DB_get_by_index 1272 1_1_0 EXIST::FUNCTION:
X509_check_ca 1273 1_1_0 EXIST::FUNCTION:
DH_get_2048_224 1274 1_1_0 EXIST::FUNCTION:DH
-X509_http_nbio 1275 1_1_0 EXIST::FUNCTION:
+X509_http_nbio 1275 1_1_0 EXIST::FUNCTION:OCSP
i2d_AUTHORITY_INFO_ACCESS 1276 1_1_0 EXIST::FUNCTION:
EVP_get_cipherbyname 1277 1_1_0 EXIST::FUNCTION:
CONF_dump_fp 1278 1_1_0 EXIST::FUNCTION:STDIO
@@ -4196,5 +4196,3 @@ DH_meth_set_bn_mod_exp 4066 1_1_0 EXIST::FUNCTION:DH
DH_meth_set_generate_key 4067 1_1_0 EXIST::FUNCTION:DH
DH_meth_free 4068 1_1_0 EXIST::FUNCTION:DH
DH_meth_get_generate_key 4069 1_1_0 EXIST::FUNCTION:DH
-err_load_crypto_strings_int 4070 1_1_0 EXIST::FUNCTION:
-err_free_strings_int 4071 1_1_0 EXIST::FUNCTION:
diff --git a/util/libssl.num b/util/libssl.num
index bcf1ac3..781a8cb 100644
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -392,4 +392,4 @@ 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
-SSL_CTX_get_ciphers 395 1_1_0 EXIST::FUNCTION
+SSL_CTX_get_ciphers 395 1_1_0 EXIST::FUNCTION:
More information about the openssl-commits
mailing list