diff options
author | Lutz Jänicke <jaenicke@openssl.org> | 2002-06-13 17:40:27 +0000 |
---|---|---|
committer | Lutz Jänicke <jaenicke@openssl.org> | 2002-06-13 17:40:27 +0000 |
commit | 40889b9cd36ba6233712d163c46154eba4a26ad7 (patch) | |
tree | f4a5ab0b224dbe89a38bf9528c1c41921a29ac30 /crypto/asn1 | |
parent | 99889b46c95711397389959a093f5556ebb39e4b (diff) |
Add missing prototypes.
Submitted by: Goetz Babin-Ebell <babinebell@trustcenter.de>
PR: 89
Diffstat (limited to 'crypto/asn1')
-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 |
4 files changed, 21 insertions, 5 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) |