summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/pkcs12.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/pkcs12.h')
-rw-r--r--src/lib/libcrypto/pkcs12/pkcs12.h22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index a2d7e359a0..fb8af82d4f 100644
--- a/src/lib/libcrypto/pkcs12/pkcs12.h
+++ b/src/lib/libcrypto/pkcs12/pkcs12.h
@@ -249,15 +249,6 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
249PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, 249PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
250 STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, 250 STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
251 int mac_iter, int keytype); 251 int mac_iter, int keytype);
252
253PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
254PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key,
255 int key_usage, int iter,
256 int key_nid, char *pass);
257int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
258 int safe_nid, int iter, char *pass);
259PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
260
261int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12); 252int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
262int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12); 253int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
263PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12); 254PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
@@ -273,18 +264,16 @@ void ERR_load_PKCS12_strings(void);
273/* Error codes for the PKCS12 functions. */ 264/* Error codes for the PKCS12 functions. */
274 265
275/* Function codes. */ 266/* Function codes. */
276#define PKCS12_F_PARSE_BAG 129
277#define PKCS12_F_PARSE_BAGS 103 267#define PKCS12_F_PARSE_BAGS 103
278#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME 100 268#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME 100
279#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC 127 269#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC 127
280#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI 102 270#define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI 102
281#define PKCS12_F_PKCS12_ADD_LOCALKEYID 104 271#define PKCS12_F_PKCS12_ADD_LOCALKEYID 104
282#define PKCS12_F_PKCS12_CREATE 105 272#define PKCS12_F_PKCS12_CREATE 105
273#define PKCS12_F_PKCS12_DECRYPT_D2I 106
283#define PKCS12_F_PKCS12_GEN_MAC 107 274#define PKCS12_F_PKCS12_GEN_MAC 107
275#define PKCS12_F_PKCS12_I2D_ENCRYPT 108
284#define PKCS12_F_PKCS12_INIT 109 276#define PKCS12_F_PKCS12_INIT 109
285#define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I 106
286#define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT 108
287#define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG 117
288#define PKCS12_F_PKCS12_KEY_GEN_ASC 110 277#define PKCS12_F_PKCS12_KEY_GEN_ASC 110
289#define PKCS12_F_PKCS12_KEY_GEN_UNI 111 278#define PKCS12_F_PKCS12_KEY_GEN_UNI 111
290#define PKCS12_F_PKCS12_MAKE_KEYBAG 112 279#define PKCS12_F_PKCS12_MAKE_KEYBAG 112
@@ -292,16 +281,17 @@ void ERR_load_PKCS12_strings(void);
292#define PKCS12_F_PKCS12_NEWPASS 128 281#define PKCS12_F_PKCS12_NEWPASS 128
293#define PKCS12_F_PKCS12_PACK_P7DATA 114 282#define PKCS12_F_PKCS12_PACK_P7DATA 114
294#define PKCS12_F_PKCS12_PACK_P7ENCDATA 115 283#define PKCS12_F_PKCS12_PACK_P7ENCDATA 115
284#define PKCS12_F_PKCS12_PACK_SAFEBAG 117
295#define PKCS12_F_PKCS12_PARSE 118 285#define PKCS12_F_PKCS12_PARSE 118
296#define PKCS12_F_PKCS12_PBE_CRYPT 119 286#define PKCS12_F_PKCS12_PBE_CRYPT 119
297#define PKCS12_F_PKCS12_PBE_KEYIVGEN 120 287#define PKCS12_F_PKCS12_PBE_KEYIVGEN 120
298#define PKCS12_F_PKCS12_SETUP_MAC 122 288#define PKCS12_F_PKCS12_SETUP_MAC 122
299#define PKCS12_F_PKCS12_SET_MAC 123 289#define PKCS12_F_PKCS12_SET_MAC 123
300#define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 130 290#define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 129
301#define PKCS12_F_PKCS12_UNPACK_P7DATA 131 291#define PKCS12_F_PKCS12_UNPACK_P7DATA 130
302#define PKCS12_F_PKCS12_VERIFY_MAC 126
303#define PKCS12_F_PKCS8_ADD_KEYUSAGE 124 292#define PKCS12_F_PKCS8_ADD_KEYUSAGE 124
304#define PKCS12_F_PKCS8_ENCRYPT 125 293#define PKCS12_F_PKCS8_ENCRYPT 125
294#define PKCS12_F_VERIFY_MAC 126
305 295
306/* Reason codes. */ 296/* Reason codes. */
307#define PKCS12_R_CANT_PACK_STRUCTURE 100 297#define PKCS12_R_CANT_PACK_STRUCTURE 100