diff options
author | beck <> | 2023-07-07 19:37:54 +0000 |
---|---|---|
committer | beck <> | 2023-07-07 19:37:54 +0000 |
commit | 8d42940c1d19bb9bd4ce45580f18a59069225432 (patch) | |
tree | b1fe16b4625998f0f024f4d3eef5d59a3e905a9a /src/lib/libcrypto/asn1/p8_pkey.c | |
parent | 1c5e77a1d6f97589e2bca622f3313c1418f9a535 (diff) | |
download | openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.gz openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.tar.bz2 openbsd-8d42940c1d19bb9bd4ce45580f18a59069225432.zip |
Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.
This unbreaks the namespace build so it will pass again
ok tb@
Diffstat (limited to 'src/lib/libcrypto/asn1/p8_pkey.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p8_pkey.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libcrypto/asn1/p8_pkey.c b/src/lib/libcrypto/asn1/p8_pkey.c index a757c95d6d..9e0cfc41da 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.22 2023/07/05 21:23:36 beck Exp $ */ | 1 | /* $OpenBSD: p8_pkey.c,v 1.23 2023/07/07 19:37:52 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,28 +121,24 @@ 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); | ||
125 | 124 | ||
126 | int | 125 | int |
127 | i2d_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO *a, unsigned char **out) | 126 | i2d_PKCS8_PRIV_KEY_INFO(PKCS8_PRIV_KEY_INFO *a, unsigned char **out) |
128 | { | 127 | { |
129 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS8_PRIV_KEY_INFO_it); | 128 | return ASN1_item_i2d((ASN1_VALUE *)a, out, &PKCS8_PRIV_KEY_INFO_it); |
130 | } | 129 | } |
131 | LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO); | ||
132 | 130 | ||
133 | PKCS8_PRIV_KEY_INFO * | 131 | PKCS8_PRIV_KEY_INFO * |
134 | PKCS8_PRIV_KEY_INFO_new(void) | 132 | PKCS8_PRIV_KEY_INFO_new(void) |
135 | { | 133 | { |
136 | return (PKCS8_PRIV_KEY_INFO *)ASN1_item_new(&PKCS8_PRIV_KEY_INFO_it); | 134 | return (PKCS8_PRIV_KEY_INFO *)ASN1_item_new(&PKCS8_PRIV_KEY_INFO_it); |
137 | } | 135 | } |
138 | LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_new); | ||
139 | 136 | ||
140 | void | 137 | void |
141 | PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *a) | 138 | PKCS8_PRIV_KEY_INFO_free(PKCS8_PRIV_KEY_INFO *a) |
142 | { | 139 | { |
143 | ASN1_item_free((ASN1_VALUE *)a, &PKCS8_PRIV_KEY_INFO_it); | 140 | ASN1_item_free((ASN1_VALUE *)a, &PKCS8_PRIV_KEY_INFO_it); |
144 | } | 141 | } |
145 | LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_free); | ||
146 | 142 | ||
147 | int | 143 | int |
148 | PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, | 144 | PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, |
@@ -158,7 +154,6 @@ PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj, int version, | |||
158 | ASN1_STRING_set0(priv->pkey, penc, penclen); | 154 | ASN1_STRING_set0(priv->pkey, penc, penclen); |
159 | return 1; | 155 | return 1; |
160 | } | 156 | } |
161 | LCRYPTO_ALIAS(PKCS8_pkey_set0); | ||
162 | 157 | ||
163 | int | 158 | int |
164 | PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, | 159 | PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, |
@@ -174,14 +169,12 @@ PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg, const unsigned char **pk, | |||
174 | *pa = p8->pkeyalg; | 169 | *pa = p8->pkeyalg; |
175 | return 1; | 170 | return 1; |
176 | } | 171 | } |
177 | LCRYPTO_ALIAS(PKCS8_pkey_get0); | ||
178 | 172 | ||
179 | const STACK_OF(X509_ATTRIBUTE) * | 173 | const STACK_OF(X509_ATTRIBUTE) * |
180 | PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8) | 174 | PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8) |
181 | { | 175 | { |
182 | return p8->attributes; | 176 | return p8->attributes; |
183 | } | 177 | } |
184 | LCRYPTO_ALIAS(PKCS8_pkey_get0_attrs); | ||
185 | 178 | ||
186 | int | 179 | int |
187 | PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, | 180 | PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, |
@@ -192,4 +185,3 @@ PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type, | |||
192 | return 1; | 185 | return 1; |
193 | return 0; | 186 | return 0; |
194 | } | 187 | } |
195 | LCRYPTO_ALIAS(PKCS8_pkey_add1_attr_by_NID); | ||