diff options
author | Ulf Möller <ulf@openssl.org> | 1999-04-26 16:43:10 +0000 |
---|---|---|
committer | Ulf Möller <ulf@openssl.org> | 1999-04-26 16:43:10 +0000 |
commit | a9be3af5ad4836f7e50f0546311ca90c717b861e (patch) | |
tree | f44f7f8c4497d85da4c5cbd08067479bb20ced95 /crypto/pkcs12/pkcs12.h | |
parent | 47339f6179fbefafc793c10b0411ed0365497d65 (diff) | |
download | openssl-a9be3af5ad4836f7e50f0546311ca90c717b861e.tar.gz |
Remove NOPROTO definitions and error code comments.
Diffstat (limited to 'crypto/pkcs12/pkcs12.h')
-rw-r--r-- | crypto/pkcs12/pkcs12.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h index 72d1f6f82e..6a489a44c3 100644 --- a/crypto/pkcs12/pkcs12.h +++ b/crypto/pkcs12/pkcs12.h @@ -189,7 +189,6 @@ ASN1_seq_unpack((p12)->authsafes->d.data->data, \ #define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0) -#ifndef NOPROTO PKCS12_SAFEBAG *PKCS12_pack_safebag(char *obj, int (*i2d)(), int nid1, int nid2); PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8); X509_SIG *PKCS8_encrypt(int pbe_nid, const char *pass, int passlen, @@ -260,60 +259,6 @@ int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12); PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12); -#else - -PKCS12_SAFEBAG *PKCS12_pack_safebag(); -PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(); -X509_SIG *PKCS8_encrypt(); -PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(); -PKCS7 *PKCS12_pack_p7data(); -PKCS7 *PKCS12_pack_p7encdata(); -int PKCS12_add_localkeyid(); -int PKCS12_add_friendlyname_asc(); -int PKCS12_add_friendlyname_uni(); -char *PKCS12_get_friendlyname(); -unsigned char *PKCS12_pbe_crypt(); -char *PKCS12_decrypt_d2i(); -ASN1_STRING *PKCS12_i2d_encrypt(); -PKCS12 *PKCS12_init(); -int PKCS12_key_gen_asc(); -int PKCS12_key_gen_uni(); -int PKCS12_PBE_keyivgen(); -int PKCS12_gen_mac(); -int PKCS12_verify_mac(); -int PKCS12_set_mac(); -int PKCS12_setup_mac(); -unsigned char *asc2uni(); -char *uni2asc(); -int i2d_PKCS12_BAGS(); -PKCS12_BAGS *PKCS12_BAGS_new(); -PKCS12_BAGS *d2i_PKCS12_BAGS(); -void PKCS12_BAGS_free(); -int i2d_PKCS12(); -PKCS12 *d2i_PKCS12(); -PKCS12 *PKCS12_new(); -void PKCS12_free(); -int i2d_PKCS12_MAC_DATA(); -PKCS12_MAC_DATA *PKCS12_MAC_DATA_new(); -PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(); -void PKCS12_MAC_DATA_free(); -int i2d_PKCS12_SAFEBAG(); -PKCS12_SAFEBAG *PKCS12_SAFEBAG_new(); -PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(); -void PKCS12_SAFEBAG_free(); -void ERR_load_PKCS12_strings(); -void PKCS12_PBE_add(); -int PKCS8_add_keyusage(); -ASN1_TYPE *PKCS12_get_attr_gen(); -int PKCS12_parse(); -PKCS12 *PKCS12_create(); -int i2d_PKCS12_bio(); -int i2d_PKCS12_fp(); -PKCS12 *d2i_PKCS12_bio(); -PKCS12 *d2i_PKCS12_fp(); - -#endif - /* 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. |