diff options
| author | Matt Caswell <matt@openssl.org> | 2016-08-13 13:40:05 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-08-16 23:36:27 +0100 |
| commit | b2e57e094db5f516cffa6f2749615a7287a7681d (patch) | |
| tree | 3ab6aeb081e13354f00e89731c44e955059d9e3f /include | |
| parent | bb2f62bababe1e735efe828bc9a467b967c8cd20 (diff) | |
Convert PKCS8* functions to use const getters
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/pkcs12.h | 3 | ||||
| -rw-r--r-- | include/openssl/x509.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index 4711dfa11e..775f20a4ee 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -141,7 +141,8 @@ int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name, int namelen); int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage); -ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid); +ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, + int attr_nid); char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag); STACK_OF(X509_ATTRIBUTE) *PKCS12_SAFEBAG_get0_attrs(PKCS12_SAFEBAG *bag); unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 5cb15b0d60..4ccf2eccd3 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -971,7 +971,8 @@ int PKCS8_pkey_get0(ASN1_OBJECT **ppkalg, const unsigned char **pk, int *ppklen, X509_ALGOR **pa, PKCS8_PRIV_KEY_INFO *p8); -STACK_OF(X509_ATTRIBUTE) *PKCS8_pkey_get0_attrs(PKCS8_PRIV_KEY_INFO *p8); +const STACK_OF(X509_ATTRIBUTE) * +PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8); int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, const unsigned char *bytes, int len); |