diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/p8_pkey.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p8_pkey.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/p8_pkey.c b/src/lib/libcrypto/asn1/p8_pkey.c index 24f1457453..a757c95d6d 100644 --- a/src/lib/libcrypto/asn1/p8_pkey.c +++ b/src/lib/libcrypto/asn1/p8_pkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p8_pkey.c,v 1.21 2022/11/26 16:08:50 tb Exp $ */ | 1 | /* $OpenBSD: p8_pkey.c,v 1.22 2023/07/05 21:23:36 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -121,24 +121,28 @@ d2i_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO **a, const unsigned char **in, long | |||
121 | return (PKCS8_PRIV_KEY_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, | 121 | return (PKCS8_PRIV_KEY_INFO *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, |
122 | &PKCS8_PRIV_KEY_INFO_it); | 122 | &PKCS8_PRIV_KEY_INFO_it); |
123 | } | 123 | } |
124 | LCRYPTO_ALIAS(d2i_PKCS8_PRIV_KEY_INFO); | ||
124 | 125 | ||
125 | int | 126 | int |
126 | i2d_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO *a, unsigned char **out) | 127 | i2d_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO *a, unsigned char **out) |
127 | { | 128 | { |
128 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS8_PRIV_KEY_INFO_it); | 129 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS8_PRIV_KEY_INFO_it); |
129 | } | 130 | } |
131 | LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO); | ||
130 | 132 | ||
131 | PKCS8_PRIV_KEY_INFO * | 133 | PKCS8_PRIV_KEY_INFO * |
132 | PKCS8_PRIV_KEY_INFO_new(void) | 134 | PKCS8_PRIV_KEY_INFO_new(void) |
133 | { | 135 | { |
134 | return (PKCS8_PRIV_KEY_INFO *)ASN1_item_new(&PKCS8_PRIV_KEY_INFO_it); | 136 | return (PKCS8_PRIV_KEY_INFO *)ASN1_item_new(&PKCS8_PRIV_KEY_INFO_it); |
135 | } | 137 | } |
138 | LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_new); | ||
136 | 139 | ||
137 | void | 140 | void |
138 | PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *a) | 141 | PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *a) |
139 | { | 142 | { |
140 | ASN1_item_free((ASN1_VALUE *)a, &PKCS8_PRIV_KEY_INFO_it); | 143 | ASN1_item_free((ASN1_VALUE *)a, &PKCS8_PRIV_KEY_INFO_it); |
141 | } | 144 | } |
145 | LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_free); | ||
142 | 146 | ||
143 | int | 147 | int |
144 | PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, | 148 | PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, |
@@ -154,6 +158,7 @@ PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, | |||
154 | ASN1_STRING_set0(priv->pkey, penc, penclen); | 158 | ASN1_STRING_set0(priv->pkey, penc, penclen); |
155 | return 1; | 159 | return 1; |
156 | } | 160 | } |
161 | LCRYPTO_ALIAS(PKCS8_pkey_set0); | ||
157 | 162 | ||
158 | int | 163 | int |
159 | PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, | 164 | PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, |
@@ -169,12 +174,14 @@ PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, | |||
169 | *pa = p8->pkeyalg; | 174 | *pa = p8->pkeyalg; |
170 | return 1; | 175 | return 1; |
171 | } | 176 | } |
177 | LCRYPTO_ALIAS(PKCS8_pkey_get0); | ||
172 | 178 | ||
173 | const STACK_OF(X509_ATTRIBUTE) * | 179 | const STACK_OF(X509_ATTRIBUTE) * |
174 | PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8) | 180 | PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8) |
175 | { | 181 | { |
176 | return p8->attributes; | 182 | return p8->attributes; |
177 | } | 183 | } |
184 | LCRYPTO_ALIAS(PKCS8_pkey_get0_attrs); | ||
178 | 185 | ||
179 | int | 186 | int |
180 | PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, | 187 | PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, |
@@ -185,4 +192,4 @@ PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, | |||
185 | return 1; | 192 | return 1; |
186 | return 0; | 193 | return 0; |
187 | } | 194 | } |
188 | 195 | LCRYPTO_ALIAS(PKCS8_pkey_add1_attr_by_NID); | |