diff options
| -rw-r--r-- | crypto/asn1/asn1.h | 1 | ||||
| -rw-r--r-- | crypto/asn1/n_pkey.c | 13 | ||||
| -rw-r--r-- | crypto/asn1/tasn_typ.c | 5 | ||||
| -rw-r--r-- | crypto/ec/ectest.c | 6 | ||||
| -rw-r--r-- | crypto/evp/c_all.c | 1 | ||||
| -rw-r--r-- | crypto/evp/evp.h | 2 |
6 files changed, 11 insertions, 17 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index dfd2244b2d..303fe5da8b 100644 --- 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 7b5ef2403f..9146ee02c9 100644 --- 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 94f88264b7..804d2eeba2 100644 --- 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 243cd83fb5..eab46cc080 100644 --- 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 5ffd352ea0..a3476de555 100644 --- 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 7c333af4a9..8bb0782472 100644 --- 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); |