diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-07-02 08:49:54 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-07-16 01:06:48 -0400 |
| commit | 0bc2f365558ed5980ce87d6b2704ca8649ca2a4a (patch) | |
| tree | 65f840378f1c01678812874a251b9c40824c51fa /include | |
| parent | 31d6c0b2b043bad5c63b797a327109eb26ff8d2a (diff) | |
Remove obsolete key formats.
Remove support for RSA_NET and Netscape key format (-keyform n).
Also removed documentation of SGC.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/asn1.h | 10 | ||||
| -rw-r--r-- | include/openssl/rsa.h | 16 |
2 files changed, 0 insertions, 26 deletions
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 06ee0369db..5b3b7d3bbb 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -509,11 +509,6 @@ typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY; DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY) DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY) -typedef struct NETSCAPE_X509_st { - ASN1_OCTET_STRING *header; - X509 *cert; -} NETSCAPE_X509; - /* This is used to contain a list of bit names */ typedef struct BIT_STRING_BITNAME_st { int bitnum; @@ -797,8 +792,6 @@ const char *ASN1_tag2str(int tag); /* Used to load and write netscape format cert */ -DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509) - int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s); int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len); @@ -1014,8 +1007,6 @@ void ERR_load_ASN1_strings(void); # define ASN1_F_D2I_NETSCAPE_RSA_2 153 # define ASN1_F_D2I_PRIVATEKEY 154 # define ASN1_F_D2I_PUBLICKEY 155 -# define ASN1_F_D2I_RSA_NET 200 -# define ASN1_F_D2I_RSA_NET_2 201 # define ASN1_F_D2I_X509 156 # define ASN1_F_D2I_X509_CINF 157 # define ASN1_F_D2I_X509_PKEY 159 @@ -1027,7 +1018,6 @@ void ERR_load_ASN1_strings(void); # define ASN1_F_I2D_EC_PUBKEY 181 # define ASN1_F_I2D_PRIVATEKEY 163 # define ASN1_F_I2D_PUBLICKEY 164 -# define ASN1_F_I2D_RSA_NET 162 # define ASN1_F_I2D_RSA_PUBKEY 165 # define ASN1_F_LONG_C2I 166 # define ASN1_F_OID_MODULE_INIT 174 diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index 727b9df4c4..9abb2a1eda 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -396,22 +396,6 @@ int RSA_print_fp(FILE *fp, const RSA *r, int offset); int RSA_print(BIO *bp, const RSA *r, int offset); -# ifndef OPENSSL_NO_RC4 -int i2d_RSA_NET(const RSA *a, unsigned char **pp, - int (*cb) (char *buf, int len, const char *prompt, - int verify), int sgckey); -RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length, - int (*cb) (char *buf, int len, const char *prompt, - int verify), int sgckey); - -int i2d_Netscape_RSA(const RSA *a, unsigned char **pp, - int (*cb) (char *buf, int len, const char *prompt, - int verify)); -RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, - int (*cb) (char *buf, int len, const char *prompt, - int verify)); -# endif - /* * The following 2 functions sign and verify a X509_SIG ASN1 object inside * PKCS#1 padded RSA encryption |