Some constification and stacks that slipped through the cracks (how?).

[openssl.git] / crypto / pkcs12 / pkcs12.h

diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 4dd0d289555c608d3ade1bfb05abbbde07fc023a..c660926cb0d27c80dea0f60d1102c763b1d3e258 100644 (file)
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -70,6 +70,11 @@ extern "C" {
 #define PKCS12_IV_ID   2
 #define PKCS12_MAC_ID  3
 
+/* Default iteration count */
+#ifndef PKCS12_DEFAULT_ITER
+#define PKCS12_DEFAULT_ITER    2048
+#endif
+
 #define PKCS12_MAC_KEY_LENGTH 20
 
 #define PKCS12_SALT_LEN        8
@@ -112,7 +117,7 @@ union {
        STACK /* PKCS12_SAFEBAG */ *safes;
        ASN1_TYPE *other;
 }value;
-STACK *attrib;
+STACK_OF(X509_ATTRIBUTE) *attrib;
 ASN1_TYPE *rest;
 } PKCS12_SAFEBAG;
 
@@ -189,7 +194,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,
@@ -209,7 +213,7 @@ int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
 int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name,
                                int namelen);
 int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
-ASN1_TYPE *PKCS12_get_attr_gen(STACK *attrs, int attr_nid);
+ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid);
 char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
 unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
                                int passlen, unsigned char *in, int inlen,
@@ -260,59 +264,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_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.
@@ -321,10 +272,10 @@ PKCS12 *d2i_PKCS12_fp();
 /* Error codes for the PKCS12 functions. */
 
 /* Function codes. */
-#define PKCS12_F_ADD_FRIENDLYNAME                       100
-#define PKCS12_F_ADD_FRIENDLYNAME_ASC                   101
-#define PKCS12_F_ADD_FRIENDLYNAME_UNI                   102
 #define PKCS12_F_PARSE_BAGS                             103
+#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME                100
+#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC            127
+#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI            102
 #define PKCS12_F_PKCS12_ADD_LOCALKEYID                  104
 #define PKCS12_F_PKCS12_CREATE                          105
 #define PKCS12_F_PKCS12_DECRYPT_D2I                     106
@@ -333,16 +284,14 @@ PKCS12 *d2i_PKCS12_fp();
 #define PKCS12_F_PKCS12_INIT                            109
 #define PKCS12_F_PKCS12_KEY_GEN_ASC                     110
 #define PKCS12_F_PKCS12_KEY_GEN_UNI                     111
-#define PKCS12_F_PKCS12_MAKE_SAFEBAG                    112
+#define PKCS12_F_PKCS12_MAKE_KEYBAG                     112
 #define PKCS12_F_PKCS12_MAKE_SHKEYBAG                   113
 #define PKCS12_F_PKCS12_PACK_P7DATA                     114
 #define PKCS12_F_PKCS12_PACK_P7ENCDATA                  115
-#define PKCS12_F_PKCS12_PACK_P7_DATA                    116
 #define PKCS12_F_PKCS12_PACK_SAFEBAG                    117
 #define PKCS12_F_PKCS12_PARSE                           118
 #define PKCS12_F_PKCS12_PBE_CRYPT                       119
 #define PKCS12_F_PKCS12_PBE_KEYIVGEN                    120
-#define PKCS12_F_PKCS12_PKCS12_SET_MAC                  121
 #define PKCS12_F_PKCS12_SETUP_MAC                       122
 #define PKCS12_F_PKCS12_SET_MAC                                 123
 #define PKCS12_F_PKCS8_ADD_KEYUSAGE                     124