diff options
| author |   tb <tb@openbsd.org> | 2018-08-24 20:17:33 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-08-24 20:17:33 +0000 |
| commit | eb5c5266934eca378b83a81d22f0c1ac7f26f093 (patch) | |
| tree | d285240e675e08285b837e7c670068a1d0cec06f /lib/libcrypto/x509/x509.h | |
| parent | The broken pkcs8 formats generated by openssl pkcs -{embed,nooct,nsdb} (diff) | |
| download | wireguard-openbsd-eb5c5266934eca378b83a81d22f0c1ac7f26f093.tar.xz wireguard-openbsd-eb5c5266934eca378b83a81d22f0c1ac7f26f093.zip | |
After removing support for broken PKCS#8 formats (it was high time),
we can add const to PKCS8_pkey_get0(). In order for this to work,
we need to sprinkle a few consts here and there.
tested in a bulk by sthen
ok jsing
Diffstat (limited to 'lib/libcrypto/x509/x509.h')
| -rw-r--r-- | lib/libcrypto/x509/x509.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h index 6c1f8eb6e94..ab1f9b46b18 100644 --- a/lib/libcrypto/x509/x509.h +++ b/lib/libcrypto/x509/x509.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.h,v 1.72 2018/08/24 20:07:42 tb Exp $ */ +/* $OpenBSD: x509.h,v 1.73 2018/08/24 20:17:33 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1290,13 +1290,10 @@ extern const ASN1_ITEM PKCS8_PRIV_KEY_INFO_it; EVP_PKEY *EVP_PKCS82PKEY(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, - const unsigned char **pk, int *ppklen, - X509_ALGOR **pa, - PKCS8_PRIV_KEY_INFO *p8); +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(const ASN1_OBJECT **ppkalg, const unsigned char **pk, + int *ppklen, 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); int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, |