diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-08-17 17:27:05 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-17 17:48:43 +0100 |
| commit | 59b4da05b4072df79e85b5f8bbf4cf049431b9b6 (patch) | |
| tree | 155db4d78c61608b24d072f6a925b9031e3c98db /crypto/pkcs12/p12_p8d.c | |
| parent | d6073e27ebdbab63bf0add13fa0f66dcaa6e39e8 (diff) | |
Constify X509_SIG.
Constify X509_SIG_get0() and order arguments to mactch new standard.
Add X509_SIG_get0_mutable() to support modification or initialisation
of an X509_SIG structure.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/pkcs12/p12_p8d.c')
| -rw-r--r-- | crypto/pkcs12/p12_p8d.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pkcs12/p12_p8d.c b/crypto/pkcs12/p12_p8d.c index 97577da26e..d926a77df8 100644 --- a/crypto/pkcs12/p12_p8d.c +++ b/crypto/pkcs12/p12_p8d.c @@ -11,12 +11,12 @@ #include "internal/cryptlib.h" #include <openssl/pkcs12.h> -PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, +PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass, int passlen) { - X509_ALGOR *dalg; - ASN1_OCTET_STRING *doct; - X509_SIG_get0(&dalg, &doct, p8); + const X509_ALGOR *dalg; + const ASN1_OCTET_STRING *doct; + X509_SIG_get0(p8, &dalg, &doct); return PKCS12_item_decrypt_d2i(dalg, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, doct, 1); |