diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/a_strex.c | 11 | ||||
-rw-r--r-- | crypto/asn1/asn1_lib.c | 1 | ||||
-rw-r--r-- | crypto/asn1/n_pkey.c | 9 | ||||
-rw-r--r-- | crypto/asn1/tasn_typ.c | 5 | ||||
-rw-r--r-- | crypto/conf/conf.h | 8 | ||||
-rw-r--r-- | crypto/conf/conf_lib.c | 5 | ||||
-rw-r--r-- | crypto/engine/eng_cnf.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_fat.c | 2 | ||||
-rw-r--r-- | crypto/rsa/rsa.h | 3 |
9 files changed, 34 insertions, 12 deletions
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 128aa7e772..8dab29dca1 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -77,8 +77,8 @@ /* Three IO functions for sending data to memory, a BIO and * and a FILE pointer. */ - -int send_mem_chars(void *arg, const void *buf, int len) +#if 0 /* never used */ +static int send_mem_chars(void *arg, const void *buf, int len) { unsigned char **out = arg; if(!out) return 1; @@ -86,15 +86,16 @@ int send_mem_chars(void *arg, const void *buf, int len) *out += len; return 1; } +#endif -int send_bio_chars(void *arg, const void *buf, int len) +static int send_bio_chars(void *arg, const void *buf, int len) { if(!arg) return 1; if(BIO_write(arg, buf, len) != len) return 0; return 1; } -int send_fp_chars(void *arg, const void *buf, int len) +static int send_fp_chars(void *arg, const void *buf, int len) { if(!arg) return 1; if(fwrite(buf, 1, len, arg) != (unsigned int)len) return 0; @@ -240,7 +241,7 @@ static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf, int buflen * #01234 format. */ -int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str) +static int do_dump(unsigned long lflags, char_io *io_ch, void *arg, ASN1_STRING *str) { /* Placing the ASN1_STRING in a temp ASN1_TYPE allows * the DER encoding to readily obtained diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 830ff2af3c..77447a5240 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -59,6 +59,7 @@ #include <stdio.h> #include "cryptlib.h" #include <openssl/asn1.h> +#include <openssl/asn1_mac.h> static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max); static void asn1_put_length(unsigned char **pp, int length); diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 49f80fffd2..7b5ef2403f 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -92,6 +92,11 @@ 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); + IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY) ASN1_SEQUENCE(NETSCAPE_PKEY) = { @@ -100,6 +105,10 @@ 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); 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 804d2eeba2..94f88264b7 100644 --- a/crypto/asn1/tasn_typ.c +++ b/crypto/asn1/tasn_typ.c @@ -104,6 +104,11 @@ 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/conf/conf.h b/crypto/conf/conf.h index 3c03fb19c0..f4671442ab 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -129,6 +129,7 @@ int CONF_dump_fp(LHASH *conf, FILE *out); int CONF_dump_bio(LHASH *conf, BIO *out); void OPENSSL_config(const char *config_name); +void OPENSSL_no_config(void); /* New conf code. The semantics are different from the functions above. If that wasn't the case, the above functions would have been replaced */ @@ -141,10 +142,10 @@ struct conf_st }; CONF *NCONF_new(CONF_METHOD *meth); -CONF_METHOD *NCONF_default(); -CONF_METHOD *NCONF_WIN32(); +CONF_METHOD *NCONF_default(void); +CONF_METHOD *NCONF_WIN32(void); #if 0 /* Just to give you an idea of what I have in mind */ -CONF_METHOD *NCONF_XML(); +CONF_METHOD *NCONF_XML(void); #endif void NCONF_free(CONF *conf); void NCONF_free_data(CONF *conf); @@ -176,6 +177,7 @@ int CONF_modules_load_file(const char *filename, const char *appname, unsigned long flags); void CONF_modules_unload(int all); void CONF_modules_finish(void); +void CONF_modules_free(void); int CONF_module_add(const char *name, conf_init_func *ifunc, conf_finish_func *ffunc); diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 7998f34c7b..6a3cf109dd 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -382,8 +382,9 @@ int NCONF_dump_bio(const CONF *conf, BIO *out) return conf->meth->dump(conf, out); } + /* This function should be avoided */ -#undef NCONF_get_number +#if 0 long NCONF_get_number(CONF *conf,char *group,char *name) { int status; @@ -397,4 +398,4 @@ long NCONF_get_number(CONF *conf,char *group,char *name) } return ret; } - +#endif diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c index 8c0ae8a1ad..cdf670901a 100644 --- a/crypto/engine/eng_cnf.c +++ b/crypto/engine/eng_cnf.c @@ -92,7 +92,7 @@ static int int_engine_init(ENGINE *e) } -int int_engine_configure(char *name, char *value, const CONF *cnf) +static int int_engine_configure(char *name, char *value, const CONF *cnf) { int i; int ret = 0; diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index d49aa7ed40..f7edb5ad32 100644 --- a/crypto/engine/eng_fat.c +++ b/crypto/engine/eng_fat.c @@ -84,7 +84,7 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags) /* Set default algorithms using a string */ -int int_def_cb(const char *alg, int len, void *arg) +static int int_def_cb(const char *alg, int len, void *arg) { unsigned int *pflags = arg; if (!strncmp(alg, "ALL", len)) diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h index 030a6c88e5..98b3bd7cc5 100644 --- a/crypto/rsa/rsa.h +++ b/crypto/rsa/rsa.h @@ -276,6 +276,9 @@ int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, int RSA_set_ex_data(RSA *r,int idx,void *arg); void *RSA_get_ex_data(const RSA *r, int idx); +RSA *RSAPublicKey_dup(RSA *rsa); +RSA *RSAPrivateKey_dup(RSA *rsa); + /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. |