Add missing funtions from non ANSI section of header files and add missing

ordinals to libeay.num.

diff --git a/CHANGES b/CHANGES
index 288a739a12a8e74e0222a842de227489f3a2d1e2..db6c2bedd2b1605c9871ed715f725d193e3e4cee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Move various #ifdefs around so NO_SYSLOG, NO_DIRENT etc are now selected
+     in e_os.h. Audit of header files to check ANSI and non ANSI
+     sections: 10 functions were absent from non ANSI section and not exported
+     from Windows DLLs. Fixed up libeay.num for new functions.
+
   *) Make `openssl version' output lines consistent.
      [Ralf S. Engelschall]
 

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 9901d6bd89937cca0a456a0e424fdd82d492dd3c..c21e50b653edc353455ef869998b4a4ab1836702 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -624,6 +624,7 @@ int         i2d_ASN1_GENERALIZEDTIME();
 ASN1_GENERALIZEDTIME * d2i_ASN1_GENERALIZEDTIME();
 int            i2d_ASN1_TIME();
 ASN1_TIME *    d2i_ASN1_TIME();
+ASN1_TIME *ASN1_TIME_set();
 int            i2d_ASN1_SET();
 STACK *                d2i_ASN1_SET();
 int a2d_ASN1_OBJECT();

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 9206f8d734b6616b66b333445ab3e4027aa0dbb3..06e57b9486a891a762aa6491baa18dcb0f93015d 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -322,13 +322,6 @@ typedef struct bio_f_buffer_ctx_struct
 #define BIO_set_app_data(s,arg)                BIO_set_ex_data(s,0,(char *)arg)
 #define BIO_get_app_data(s)            BIO_get_ex_data(s,0)
 
-int BIO_get_ex_num(BIO *bio);
-int BIO_set_ex_data(BIO *bio,int idx,char *data);
-char *BIO_get_ex_data(BIO *bio,int idx);
-void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)());
-int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-       int (*dup_func)(), void (*free_func)());
-
 /* BIO_s_connect() and BIO_s_socks4a_connect() */
 #define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
 #define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
@@ -445,6 +438,14 @@ int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
 #endif
 
 #ifndef NOPROTO
+
+int BIO_get_ex_num(BIO *bio);
+int BIO_set_ex_data(BIO *bio,int idx,char *data);
+char *BIO_get_ex_data(BIO *bio,int idx);
+void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)());
+int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
+       int (*dup_func)(), void (*free_func)());
+
 #  if defined(WIN16) && defined(_WINDLL)
 BIO_METHOD *BIO_s_file_internal(void);
 BIO *BIO_new_file_internal(char *filename, char *mode);
@@ -461,6 +462,13 @@ BIO *BIO_new_fp(FILE *stream, int close_flag);
 #    define BIO_new_fp_internal                BIO_s_file
 #  endif /* FP_API */
 #else
+
+int BIO_get_ex_num();
+int BIO_set_ex_data();
+char *BIO_get_ex_data();
+void BIO_set_ex_free_func();
+int BIO_get_ex_new_index();
+
 #  if defined(WIN16) && defined(_WINDLL)
 BIO_METHOD *BIO_s_file_internal();
 BIO *BIO_new_file_internal();

diff --git a/crypto/bn/bn.org b/crypto/bn/bn.org
index 2de26c2f9102d2ecbc8f4fc4babe2e0fa7c642f3..d26de6093f4dd058dea741913446925ba9975cc0 100644 (file)
--- a/crypto/bn/bn.org
+++ b/crypto/bn/bn.org
@@ -534,6 +534,7 @@ BN_MONT_CTX *BN_MONT_CTX_new();
 void BN_MONT_CTX_init();
 void BN_MONT_CTX_free();
 int BN_MONT_CTX_set();
+BN_MONT_CTX *BN_MONT_CTX_copy();
 
 BN_BLINDING *BN_BLINDING_new();
 void BN_BLINDING_free();
@@ -541,6 +542,9 @@ int BN_BLINDING_update();
 int BN_BLINDING_convert();
 int BN_BLINDING_invert();
 
+void BN_set_params();
+int BN_get_params();
+
 void bn_mul_normal();
 void bn_mul_comba8();
 void bn_mul_comba4();

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 5239d541f9a1df4113e8ad538e289ec9d18a3358..2655acd7fcdcde6dab3f0763c2168511ec23d423 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -694,6 +694,7 @@ EVP_MD *EVP_sha1();
 EVP_MD *EVP_dss();
 EVP_MD *EVP_dss1();
 EVP_MD *EVP_mdc2();
+EVP_MD *EVP_ripemd160();
 
 EVP_CIPHER *EVP_enc_null();
 EVP_CIPHER *EVP_des_ecb();

diff --git a/crypto/pem/pem.org b/crypto/pem/pem.org
index f1baa2024d7528d56c6198c61695c01f640b7716..14df71e906c874f0fbc3e92041e80cd2e6d96966 100644 (file)
--- a/crypto/pem/pem.org
+++ b/crypto/pem/pem.org
@@ -482,6 +482,8 @@ int PEM_ASN1_write_bio();
 int    PEM_SealInit();
 void   PEM_SealUpdate();
 int    PEM_SealFinal();
+void    PEM_SignInit();
+void    PEM_SignUpdate();
 int    PEM_SignFinal();
 
 void   ERR_load_PEM_strings();

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index 1f5f79785841c519d2b848c09b6113a32c80bd0f..0d1b340552278bfb069c5d2ffe2fb6ee469ea44f 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -290,6 +290,11 @@ void GENERAL_NAME_free();
 STACK *i2v_GENERAL_NAME();
 GENERAL_NAME *v2i_GENERAL_NAME();
 
+int i2d_AUTHORITY_KEYID();
+AUTHORITY_KEYID *d2i_AUTHORITY_KEYID();
+AUTHORITY_KEYID *AUTHORITY_KEYID_new();
+void AUTHORITY_KEYID_free();
+
 int i2d_PKEY_USAGE_PERIOD();
 PKEY_USAGE_PERIOD *d2i_PKEY_USAGE_PERIOD();
 PKEY_USAGE_PERIOD *PKEY_USAGE_PERIOD_new();

diff --git a/e_os.h b/e_os.h
index a2e1a8d09bfd66e2c10ae872bc0f3eef44e8c84b..eb5c7bf696e4b30309e38b963feec2a0b4dfdaeb 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -149,8 +149,8 @@ extern "C" {
 
 #if !defined(WINNT)
 #define NO_SYSLOG
-#define NO_DIRENT
 #endif
+#define NO_DIRENT
 
 #endif
 

diff --git a/util/libeay.num b/util/libeay.num
index aa235405c094bb799f52f5990003bcbaef96a6af..4404a2b2bf58fe21d3bdf8aad7c70741906b2108 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1219,3 +1219,13 @@ BIO_f_reliable                          1244
 PKCS7_dataFinal                         1245
 PKCS7_dataDecode                        1246
 X509V3_EXT_CRL_add_conf                 1247
+BN_set_params                           1248
+BN_get_params                           1249
+BIO_get_ex_num                          1250
+BIO_set_ex_free_func                    1251
+EVP_ripemd160                           1252
+ASN1_TIME_set                           1253
+i2d_AUTHORITY_KEYID                     1254
+d2i_AUTHORITY_KEYID                     1255
+AUTHORITY_KEYID_new                     1256
+AUTHORITY_KEYID_free                    1257