diff options
| author | Matt Caswell <matt@openssl.org> | 2016-08-13 13:07:42 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-19 16:46:19 +0200 |
| commit | 28da14555f09f1d523b8b7277529fb80a1383e85 (patch) | |
| tree | e6de88a15c2207c2b5d5462b81deccfb23d722be /crypto/pkcs12/p12_kiss.c | |
| parent | Update function error code (diff) | |
| download | openssl-28da14555f09f1d523b8b7277529fb80a1383e85.tar.xz openssl-28da14555f09f1d523b8b7277529fb80a1383e85.zip | |
Convert PKCS12* functions to use const getters
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/pkcs12/p12_kiss.c')
| -rw-r--r-- | crypto/pkcs12/p12_kiss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index ea7e0c94ef..62f5d1ec17 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -16,7 +16,7 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts); -static int parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass, +static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass, int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts); static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, @@ -157,7 +157,7 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen, return 1; } -static int parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass, +static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass, int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts) { int i; @@ -174,7 +174,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, { PKCS8_PRIV_KEY_INFO *p8; X509 *x509; - ASN1_TYPE *attrib; + const ASN1_TYPE *attrib; ASN1_BMPSTRING *fname = NULL; ASN1_OCTET_STRING *lkid = NULL; |