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>

diff --git a/include/internal/err.h b/include/internal/err.h
index dbb47967b46486633761bed28a8ddbc645ec07ec..98ba4944dbf913729a44ed6f8c1d7af26b002524 100644 (file)
--- 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 8bb4480df9522a9856ca8ed8e080fd154f65e9c6..6caae5de7d4fa1f413ef0c776a90ccd918b80370 100644 (file)
--- 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 ea87486547dcfe5e7442e7cc233302203ab64ed3..9f8d561b0087ef52c91089946f53973ddedb189d 100755 (executable)
--- 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;