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/evp/evp_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/evp/evp_pkey.c')
-rw-r--r-- | src/lib/libcrypto/evp/evp_pkey.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c index 31a59e2536..9e29a1ae69 100644 --- a/src/lib/libcrypto/evp/evp_pkey.c +++ b/src/lib/libcrypto/evp/evp_pkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: evp_pkey.c,v 1.26 2023/07/07 13:54:45 beck Exp $ */ | 1 | /* $OpenBSD: evp_pkey.c,v 1.27 2023/07/07 19:37:53 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 | */ |
@@ -105,7 +105,6 @@ error: | |||
105 | EVP_PKEY_free(pkey); | 105 | EVP_PKEY_free(pkey); |
106 | return NULL; | 106 | return NULL; |
107 | } | 107 | } |
108 | LCRYPTO_ALIAS(EVP_PKCS82PKEY); | ||
109 | 108 | ||
110 | /* Turn a private key into a PKCS8 structure */ | 109 | /* Turn a private key into a PKCS8 structure */ |
111 | 110 | ||
@@ -139,7 +138,6 @@ error: | |||
139 | PKCS8_PRIV_KEY_INFO_free(p8); | 138 | PKCS8_PRIV_KEY_INFO_free(p8); |
140 | return NULL; | 139 | return NULL; |
141 | } | 140 | } |
142 | LCRYPTO_ALIAS(EVP_PKEY2PKCS8); | ||
143 | 141 | ||
144 | /* EVP_PKEY attribute functions */ | 142 | /* EVP_PKEY attribute functions */ |
145 | 143 | ||
@@ -148,14 +146,12 @@ EVP_PKEY_get_attr_count(const EVP_PKEY *key) | |||
148 | { | 146 | { |
149 | return X509at_get_attr_count(key->attributes); | 147 | return X509at_get_attr_count(key->attributes); |
150 | } | 148 | } |
151 | LCRYPTO_ALIAS(EVP_PKEY_get_attr_count); | ||
152 | 149 | ||
153 | int | 150 | int |
154 | EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) | 151 | EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos) |
155 | { | 152 | { |
156 | return X509at_get_attr_by_NID(key->attributes, nid, lastpos); | 153 | return X509at_get_attr_by_NID(key->attributes, nid, lastpos); |
157 | } | 154 | } |
158 | LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_NID); | ||
159 | 155 | ||
160 | int | 156 | int |
161 | EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, | 157 | EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, |
@@ -163,21 +159,18 @@ EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, | |||
163 | { | 159 | { |
164 | return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); | 160 | return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); |
165 | } | 161 | } |
166 | LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_OBJ); | ||
167 | 162 | ||
168 | X509_ATTRIBUTE * | 163 | X509_ATTRIBUTE * |
169 | EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) | 164 | EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) |
170 | { | 165 | { |
171 | return X509at_get_attr(key->attributes, loc); | 166 | return X509at_get_attr(key->attributes, loc); |
172 | } | 167 | } |
173 | LCRYPTO_ALIAS(EVP_PKEY_get_attr); | ||
174 | 168 | ||
175 | X509_ATTRIBUTE * | 169 | X509_ATTRIBUTE * |
176 | EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) | 170 | EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) |
177 | { | 171 | { |
178 | return X509at_delete_attr(key->attributes, loc); | 172 | return X509at_delete_attr(key->attributes, loc); |
179 | } | 173 | } |
180 | LCRYPTO_ALIAS(EVP_PKEY_delete_attr); | ||
181 | 174 | ||
182 | int | 175 | int |
183 | EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) | 176 | EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) |
@@ -186,7 +179,6 @@ EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) | |||
186 | return 1; | 179 | return 1; |
187 | return 0; | 180 | return 0; |
188 | } | 181 | } |
189 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr); | ||
190 | 182 | ||
191 | int | 183 | int |
192 | EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, | 184 | EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, |
@@ -196,7 +188,6 @@ EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type, | |||
196 | return 1; | 188 | return 1; |
197 | return 0; | 189 | return 0; |
198 | } | 190 | } |
199 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ); | ||
200 | 191 | ||
201 | int | 192 | int |
202 | EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, | 193 | EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, |
@@ -206,7 +197,6 @@ EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, int nid, int type, | |||
206 | return 1; | 197 | return 1; |
207 | return 0; | 198 | return 0; |
208 | } | 199 | } |
209 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID); | ||
210 | 200 | ||
211 | int | 201 | int |
212 | EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, | 202 | EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, |
@@ -217,4 +207,3 @@ EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type, | |||
217 | return 1; | 207 | return 1; |
218 | return 0; | 208 | return 0; |
219 | } | 209 | } |
220 | LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_txt); | ||