summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-06 11:50:05 +0200
committerMatt Caswell <matt@openssl.org>2016-04-13 09:58:59 +0200
commit20c56358e6f278d6a469a92280d7a38be44dbe3e (patch)
treebb88212781cc7b92c3eba4db165bfaa098e0096c
parentRename lots of *_intern or *_internal function to int_* (diff)
downloadopenssl-20c56358e6f278d6a469a92280d7a38be44dbe3e.tar.xz
openssl-20c56358e6f278d6a469a92280d7a38be44dbe3e.zip
Fix symbols missing from shared build
libssl needs to have access to some internal libcrypto symbols. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--include/internal/err.h5
-rw-r--r--util/libcrypto.num2
-rwxr-xr-xutil/mkdef.pl1
3 files changed, 8 insertions, 0 deletions
diff --git a/include/internal/err.h b/include/internal/err.h
index dbb47967b4..98ba4944db 100644
--- a/include/internal/err.h
+++ b/include/internal/err.h
@@ -55,5 +55,10 @@
*
*/
+#ifndef INTERNAL_ERR_H
+# define INTERNAL_ERR_H
+
void int_err_load_crypto_strings(void);
void int_err_free_strings(void);
+
+#endif
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 8bb4480df9..6caae5de7d 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4196,3 +4196,5 @@ 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
+int_err_load_crypto_strings 4070 1_1_0 EXIST::FUNCTION:
+int_err_free_strings 4071 1_1_0 EXIST::FUNCTION:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index ea87486547..9f8d561b00 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -240,6 +240,7 @@ my $crypto ="include/openssl/crypto.h";
$crypto.=" include/internal/o_dir.h";
$crypto.=" include/internal/o_str.h";
$crypto.=" include/internal/threads.h";
+$crypto.=" include/internal/err.h";
$crypto.=" include/openssl/des.h" ; # unless $no_des;
$crypto.=" include/openssl/idea.h" ; # unless $no_idea;
$crypto.=" include/openssl/rc4.h" ; # unless $no_rc4;