Commit 82af00fb authored by FdaSilvaYY's avatar FdaSilvaYY Committed by Rich Salz
Browse files

Constify PKCS12_create, PKCS12_add_key, PKCS12_add_safe. 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1215)
parent 159b9a4d

crypto/pkcs12/p12_crt.c

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid) 
    return 1;

}



PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,

PKCS12 *PKCS12_create(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)

{
@@ -170,7 +170,7 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert) 


PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,

                               EVP_PKEY *key, int key_usage, int iter,

                               int nid_key, char *pass)

                               int nid_key, const char *pass)

{



    PKCS12_SAFEBAG *bag = NULL;
@@ -203,7 +203,7 @@ PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, 
}



int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,

                    int nid_safe, int iter, char *pass)

                    int nid_safe, int iter, const char *pass)

{

    PKCS7 *p7 = NULL;

    int free_safes = 0;

doc/crypto/PKCS12_create.pod

+3 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ PKCS12_create - create a PKCS#12 structure 


 #include <openssl/pkcs12.h>



 PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, STACK_OF(X509) *ca,

 PKCS12 *PKCS12_create(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);



=head1 DESCRIPTION

include/openssl/pkcs12.h

+5 −5
Original line number Diff line number Diff line
@@ -188,16 +188,16 @@ DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES) 
void PKCS12_PBE_add(void);

int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,

                 STACK_OF(X509) **ca);

PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,

                      STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,

                      int mac_iter, int keytype);

PKCS12 *PKCS12_create(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);



PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);

PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,

                               EVP_PKEY *key, int key_usage, int iter,

                               int key_nid, char *pass);

                               int key_nid, const char *pass);

int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,

                    int safe_nid, int iter, char *pass);

                    int safe_nid, int iter, const char *pass);

PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);



int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);