Some more prototype fixes.

Use DECLARE macros in asn1* instead of direct declaration.
Submitted by: Goetz Babin-Ebell <babinebell@trustcenter.de>
Reviewed by:
PR: 89

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index dfd2244b2da8ad72514bc17014a7bb4ce475b5b3..303fe5da8b6bc7f014b9a5984ef7b1da03424cbb 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -773,6 +773,7 @@ int         ASN1_OCTET_STRING_cmp(ASN1_OCTET_STRING *a, ASN1_OCTET_STRING *b);
 int    ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, unsigned char *data, int len);
 
 DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
+DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
 DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)
 DECLARE_ASN1_FUNCTIONS(ASN1_NULL)
 DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)

diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index 7b5ef2403fe4ca8ac6d452bc3e7f8d83e752b417..9146ee02c966191e8aab9244661609cdc3a66c09 100644 (file)
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -92,11 +92,8 @@ ASN1_BROKEN_SEQUENCE(NETSCAPE_ENCRYPTED_PKEY) = {
        ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)
 } ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY)
 
-NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **p, const unsigned char **in, long len);
-int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out);
-NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void);
-void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a);
-
+DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY)
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY,NETSCAPE_ENCRYPTED_PKEY)
 IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY)
 
 ASN1_SEQUENCE(NETSCAPE_PKEY) = {
@@ -105,10 +102,8 @@ ASN1_SEQUENCE(NETSCAPE_PKEY) = {
        ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(NETSCAPE_PKEY)
 
-NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **p, const unsigned char **in, long len);
-int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out);
-NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
-void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a);
+DECLARE_ASN1_FUNCTIONS_const(NETSCAPE_PKEY)
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_PKEY,NETSCAPE_PKEY)
 IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_PKEY)
 
 static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,

diff --git a/crypto/asn1/tasn_typ.c b/crypto/asn1/tasn_typ.c
index 94f88264b73f58fb982775e607850b815889afc6..804d2eeba273ec2ae8fd03c102c6d0cc5a7d0a06 100644 (file)
--- a/crypto/asn1/tasn_typ.c
+++ b/crypto/asn1/tasn_typ.c
@@ -104,11 +104,6 @@ IMPLEMENT_ASN1_TYPE(ASN1_VISIBLESTRING)
 IMPLEMENT_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
 
 IMPLEMENT_ASN1_TYPE(ASN1_UNIVERSALSTRING)
-ASN1_UNIVERSALSTRING *d2i_ASN1_UNIVERSALSTRING(ASN1_UNIVERSALSTRING**a, unsigned char **in, long len);
-int i2d_ASN1_UNIVERSALSTRING(ASN1_UNIVERSALSTRING *a, unsigned char **out);
-ASN1_UNIVERSALSTRING *ASN1_UNIVERSALSTRING_new(void);
-void ASN1_UNIVERSALSTRING_free(ASN1_UNIVERSALSTRING *a);
-
 IMPLEMENT_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
 
 IMPLEMENT_ASN1_TYPE(ASN1_BMPSTRING)

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 243cd83fb54aa7d0cb5ebc06b0a8a74dd7e080ed..eab46cc0806eb945e93d4aa9397905f0ed6d6c1d 100644 (file)
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -75,8 +75,8 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
        exit(1); \
 } while (0)
 
-
-void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
+#if 0
+static void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
        {
        clock_t clck;
        int i, j;
@@ -138,7 +138,7 @@ void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
        BN_free(s);
        BN_free(s0);
        }
-
+#endif
 
 int main(int argc, char *argv[])
        {       

diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c
index 5ffd352ea0c784c9817287b9675a5713e65f095b..a3476de5555f29c8b08c02ea4ad377fd03c4cb2e 100644 (file)
--- a/crypto/evp/c_all.c
+++ b/crypto/evp/c_all.c
@@ -61,6 +61,7 @@
 #include <openssl/evp.h>
 
 #undef OpenSSL_add_all_algorithms
+void OpenSSL_add_all_algorithms(void);
 
 void OpenSSL_add_all_algorithms(void)
        {

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 7c333af4a97317b8de5373dc0f9a417f90fb1efc..8bb0782472486a8519dc7da1f9a64773f71ede37 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -601,6 +601,8 @@ const EVP_CIPHER *EVP_enc_null(void);               /* does nothing :-) */
 const EVP_CIPHER *EVP_des_ecb(void);
 const EVP_CIPHER *EVP_des_ede(void);
 const EVP_CIPHER *EVP_des_ede3(void);
+const EVP_CIPHER *EVP_des_ede_ecb(void);
+const EVP_CIPHER *EVP_des_ede3_ecb(void);
 const EVP_CIPHER *EVP_des_cfb(void);
 const EVP_CIPHER *EVP_des_ede_cfb(void);
 const EVP_CIPHER *EVP_des_ede3_cfb(void);