|
@@ -23,6 +23,7 @@ use OpenSSL::stackhash qw(generate_stack_macros);
|
|
# endif
|
|
# endif
|
|
|
|
|
|
# include <openssl/bio.h>
|
|
# include <openssl/bio.h>
|
|
|
|
+# include <openssl/core.h>
|
|
# include <openssl/x509.h>
|
|
# include <openssl/x509.h>
|
|
# include <openssl/pkcs12err.h>
|
|
# include <openssl/pkcs12err.h>
|
|
|
|
|
|
@@ -124,23 +125,50 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid,
|
|
unsigned char *salt,
|
|
unsigned char *salt,
|
|
int saltlen, int iter,
|
|
int saltlen, int iter,
|
|
PKCS8_PRIV_KEY_INFO *p8inf);
|
|
PKCS8_PRIV_KEY_INFO *p8inf);
|
|
|
|
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(int pbe_nid,
|
|
|
|
+ const char *pass,
|
|
|
|
+ int passlen,
|
|
|
|
+ unsigned char *salt,
|
|
|
|
+ int saltlen, int iter,
|
|
|
|
+ PKCS8_PRIV_KEY_INFO *p8inf,
|
|
|
|
+ OSSL_LIB_CTX *ctx,
|
|
|
|
+ const char *propq);
|
|
|
|
|
|
PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
|
|
PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
|
|
int nid1, int nid2);
|
|
int nid1, int nid2);
|
|
PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass,
|
|
PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass,
|
|
int passlen);
|
|
int passlen);
|
|
|
|
+PKCS8_PRIV_KEY_INFO *PKCS8_decrypt_ex(const X509_SIG *p8, const char *pass,
|
|
|
|
+ int passlen, OSSL_LIB_CTX *ctx,
|
|
|
|
+ const char *propq);
|
|
PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
|
|
PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
|
|
const char *pass, int passlen);
|
|
const char *pass, int passlen);
|
|
|
|
+PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey_ex(const PKCS12_SAFEBAG *bag,
|
|
|
|
+ const char *pass, int passlen,
|
|
|
|
+ OSSL_LIB_CTX *ctx,
|
|
|
|
+ const char *propq);
|
|
X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
|
|
X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
|
|
const char *pass, int passlen, unsigned char *salt,
|
|
const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
|
|
int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
|
|
|
|
+X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
|
|
|
|
+ const char *pass, int passlen, unsigned char *salt,
|
|
|
|
+ int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
X509_SIG *PKCS8_set0_pbe(const char *pass, int passlen,
|
|
X509_SIG *PKCS8_set0_pbe(const char *pass, int passlen,
|
|
PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe);
|
|
PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe);
|
|
|
|
+X509_SIG *PKCS8_set0_pbe_ex(const char *pass, int passlen,
|
|
|
|
+ PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
|
|
PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
|
|
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
|
|
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
|
|
PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
|
|
PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
|
|
unsigned char *salt, int saltlen, int iter,
|
|
unsigned char *salt, int saltlen, int iter,
|
|
STACK_OF(PKCS12_SAFEBAG) *bags);
|
|
STACK_OF(PKCS12_SAFEBAG) *bags);
|
|
|
|
+PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
|
|
|
|
+ unsigned char *salt, int saltlen, int iter,
|
|
|
|
+ STACK_OF(PKCS12_SAFEBAG) *bags,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
+
|
|
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
|
|
STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
|
|
int passlen);
|
|
int passlen);
|
|
|
|
|
|
@@ -172,26 +200,62 @@ unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
|
|
const unsigned char *in, int inlen,
|
|
const unsigned char *in, int inlen,
|
|
unsigned char **data, int *datalen,
|
|
unsigned char **data, int *datalen,
|
|
int en_de);
|
|
int en_de);
|
|
|
|
+unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
|
|
|
|
+ const char *pass, int passlen,
|
|
|
|
+ const unsigned char *in, int inlen,
|
|
|
|
+ unsigned char **data, int *datalen,
|
|
|
|
+ int en_de, OSSL_LIB_CTX *libctx,
|
|
|
|
+ const char *propq);
|
|
void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
|
|
void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
|
|
const char *pass, int passlen,
|
|
const char *pass, int passlen,
|
|
const ASN1_OCTET_STRING *oct, int zbuf);
|
|
const ASN1_OCTET_STRING *oct, int zbuf);
|
|
|
|
+void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
|
|
|
|
+ const char *pass, int passlen,
|
|
|
|
+ const ASN1_OCTET_STRING *oct, int zbuf,
|
|
|
|
+ OSSL_LIB_CTX *libctx,
|
|
|
|
+ const char *propq);
|
|
ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
|
|
ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
|
|
const ASN1_ITEM *it,
|
|
const ASN1_ITEM *it,
|
|
const char *pass, int passlen,
|
|
const char *pass, int passlen,
|
|
void *obj, int zbuf);
|
|
void *obj, int zbuf);
|
|
|
|
+ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
|
|
|
|
+ const ASN1_ITEM *it,
|
|
|
|
+ const char *pass, int passlen,
|
|
|
|
+ void *obj, int zbuf,
|
|
|
|
+ OSSL_LIB_CTX *ctx,
|
|
|
|
+ const char *propq);
|
|
PKCS12 *PKCS12_init(int mode);
|
|
PKCS12 *PKCS12_init(int mode);
|
|
|
|
+PKCS12 *PKCS12_init_ex(int mode, OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
+
|
|
int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
|
|
int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type);
|
|
unsigned char *out, const EVP_MD *md_type);
|
|
|
|
+int PKCS12_key_gen_asc_ex(const char *pass, int passlen, unsigned char *salt,
|
|
|
|
+ int saltlen, int id, int iter, int n,
|
|
|
|
+ unsigned char *out, const EVP_MD *md_type,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
|
|
int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type);
|
|
unsigned char *out, const EVP_MD *md_type);
|
|
|
|
+int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
|
|
|
|
+ int saltlen, int id, int iter, int n,
|
|
|
|
+ unsigned char *out, const EVP_MD *md_type,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt,
|
|
int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt,
|
|
int saltlen, int id, int iter, int n,
|
|
int saltlen, int id, int iter, int n,
|
|
unsigned char *out, const EVP_MD *md_type);
|
|
unsigned char *out, const EVP_MD *md_type);
|
|
|
|
+int PKCS12_key_gen_utf8_ex(const char *pass, int passlen, unsigned char *salt,
|
|
|
|
+ int saltlen, int id, int iter, int n,
|
|
|
|
+ unsigned char *out, const EVP_MD *md_type,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
+
|
|
int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
|
|
int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
|
|
ASN1_TYPE *param, const EVP_CIPHER *cipher,
|
|
ASN1_TYPE *param, const EVP_CIPHER *cipher,
|
|
const EVP_MD *md_type, int en_de);
|
|
const EVP_MD *md_type, int en_de);
|
|
|
|
+int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
|
|
|
|
+ ASN1_TYPE *param, const EVP_CIPHER *cipher,
|
|
|
|
+ const EVP_MD *md_type, int en_de,
|
|
|
|
+ OSSL_LIB_CTX *libctx, const char *propq);
|
|
int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
|
|
int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
|
|
unsigned char *mac, unsigned int *maclen);
|
|
unsigned char *mac, unsigned int *maclen);
|
|
int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
|
|
int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
|
|
@@ -221,16 +285,31 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
|
|
PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey,
|
|
PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey,
|
|
X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
|
|
X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
|
|
int iter, int mac_iter, int keytype);
|
|
int iter, int mac_iter, int keytype);
|
|
|
|
+PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey,
|
|
|
|
+ X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
|
|
|
|
+ int iter, int mac_iter, int keytype,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
|
|
PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
|
|
PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
|
|
PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
|
|
PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
|
|
EVP_PKEY *key, int key_usage, int iter,
|
|
EVP_PKEY *key, int key_usage, int iter,
|
|
int key_nid, const char *pass);
|
|
int key_nid, const char *pass);
|
|
|
|
+PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
|
|
|
|
+ EVP_PKEY *key, int key_usage, int iter,
|
|
|
|
+ int key_nid, const char *pass,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
+
|
|
PKCS12_SAFEBAG *PKCS12_add_secret(STACK_OF(PKCS12_SAFEBAG) **pbags,
|
|
PKCS12_SAFEBAG *PKCS12_add_secret(STACK_OF(PKCS12_SAFEBAG) **pbags,
|
|
int nid_type, const unsigned char *value, int len);
|
|
int nid_type, const unsigned char *value, int len);
|
|
int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
|
|
int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
|
|
int safe_nid, int iter, const char *pass);
|
|
int safe_nid, int iter, const char *pass);
|
|
|
|
+int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
|
|
|
|
+ int safe_nid, int iter, const char *pass,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
+
|
|
PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
|
|
PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
|
|
|
|
+PKCS12 *PKCS12_add_safes_ex(STACK_OF(PKCS7) *safes, int p7_nid,
|
|
|
|
+ OSSL_LIB_CTX *ctx, const char *propq);
|
|
|
|
|
|
int i2d_PKCS12_bio(BIO *bp, const PKCS12 *p12);
|
|
int i2d_PKCS12_bio(BIO *bp, const PKCS12 *p12);
|
|
# ifndef OPENSSL_NO_STDIO
|
|
# ifndef OPENSSL_NO_STDIO
|