diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-08-17 00:21:55 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-17 12:01:29 +0100 |
| commit | 245c6bc33b1481052f347f316cec16888aa1be85 (patch) | |
| tree | 9ffe8102e9e1891fb5820cecc07203f54c7fddb9 /include | |
| parent | ac4e257747075958d37665f327bdf685dd2478ab (diff) | |
| download | openssl-245c6bc33b1481052f347f316cec16888aa1be85.zip openssl-245c6bc33b1481052f347f316cec16888aa1be85.tar.gz openssl-245c6bc33b1481052f347f316cec16888aa1be85.tar.bz2 | |
Constify private key decode.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 2 | ||||
| -rw-r--r-- | include/openssl/x509.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 46a2e26..3727545 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1068,7 +1068,7 @@ void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth, int (*pkey_bits) (const EVP_PKEY *pk)); void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth, int (*priv_decode) (EVP_PKEY *pk, - PKCS8_PRIV_KEY_INFO + const PKCS8_PRIV_KEY_INFO *p8inf), int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk), diff --git a/include/openssl/x509.h b/include/openssl/x509.h index b092084..f8d1881 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -961,15 +961,15 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO) -EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8); +EVP_PKEY *EVP_PKCS82PKEY(const PKCS8_PRIV_KEY_INFO *p8); PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey); int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, int ptype, void *pval, unsigned char *penc, int penclen); -int PKCS8_pkey_get0(ASN1_OBJECT **ppkalg, +int PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, int *ppklen, - X509_ALGOR **pa, PKCS8_PRIV_KEY_INFO *p8); + const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8); const STACK_OF(X509_ATTRIBUTE) * PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8); |