summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2024-08-31 10:25:38 +0000
committertb <>2024-08-31 10:25:38 +0000
commitdfe0db320ed7b242f95c66b5d0cb7525257a6882 (patch)
tree25c9f27a907b66043fdde3e70d610ed8b539167e /src/lib
parentdf13e5b090fdd7526e1f2c4242ff8deb5a98c783 (diff)
downloadopenbsd-dfe0db320ed7b242f95c66b5d0cb7525257a6882.tar.gz
openbsd-dfe0db320ed7b242f95c66b5d0cb7525257a6882.tar.bz2
openbsd-dfe0db320ed7b242f95c66b5d0cb7525257a6882.zip
Remove EVP_PKEY.*attr* API
I ranted enough about this recently. PKCS#12. Microsoft. 'nuff said. ok beck jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Symbols.list9
-rw-r--r--src/lib/libcrypto/evp/evp_pkey.c82
-rw-r--r--src/lib/libcrypto/hidden/openssl/x509.h11
-rw-r--r--src/lib/libcrypto/x509/x509.h20
4 files changed, 3 insertions, 119 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 801e87e3d7..89cfae2f2a 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1209,10 +1209,6 @@ EVP_PKEY_CTX_set0_keygen_info
1209EVP_PKEY_CTX_set_app_data 1209EVP_PKEY_CTX_set_app_data
1210EVP_PKEY_CTX_set_cb 1210EVP_PKEY_CTX_set_cb
1211EVP_PKEY_CTX_set_data 1211EVP_PKEY_CTX_set_data
1212EVP_PKEY_add1_attr
1213EVP_PKEY_add1_attr_by_NID
1214EVP_PKEY_add1_attr_by_OBJ
1215EVP_PKEY_add1_attr_by_txt
1216EVP_PKEY_asn1_find 1212EVP_PKEY_asn1_find
1217EVP_PKEY_asn1_find_str 1213EVP_PKEY_asn1_find_str
1218EVP_PKEY_asn1_get0 1214EVP_PKEY_asn1_get0
@@ -1227,7 +1223,6 @@ EVP_PKEY_copy_parameters
1227EVP_PKEY_decrypt 1223EVP_PKEY_decrypt
1228EVP_PKEY_decrypt_init 1224EVP_PKEY_decrypt_init
1229EVP_PKEY_decrypt_old 1225EVP_PKEY_decrypt_old
1230EVP_PKEY_delete_attr
1231EVP_PKEY_derive 1226EVP_PKEY_derive
1232EVP_PKEY_derive_init 1227EVP_PKEY_derive_init
1233EVP_PKEY_derive_set_peer 1228EVP_PKEY_derive_set_peer
@@ -1246,10 +1241,6 @@ EVP_PKEY_get1_DH
1246EVP_PKEY_get1_DSA 1241EVP_PKEY_get1_DSA
1247EVP_PKEY_get1_EC_KEY 1242EVP_PKEY_get1_EC_KEY
1248EVP_PKEY_get1_RSA 1243EVP_PKEY_get1_RSA
1249EVP_PKEY_get_attr
1250EVP_PKEY_get_attr_by_NID
1251EVP_PKEY_get_attr_by_OBJ
1252EVP_PKEY_get_attr_count
1253EVP_PKEY_get_default_digest_nid 1244EVP_PKEY_get_default_digest_nid
1254EVP_PKEY_get_raw_private_key 1245EVP_PKEY_get_raw_private_key
1255EVP_PKEY_get_raw_public_key 1246EVP_PKEY_get_raw_public_key
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c
index dcbd51f08d..5bec811060 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.31 2024/08/22 12:21:07 tb Exp $ */ 1/* $OpenBSD: evp_pkey.c,v 1.32 2024/08/31 10:25:38 tb 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 */
@@ -140,83 +140,3 @@ error:
140 return NULL; 140 return NULL;
141} 141}
142LCRYPTO_ALIAS(EVP_PKEY2PKCS8); 142LCRYPTO_ALIAS(EVP_PKEY2PKCS8);
143
144/*
145 * XXX - delete all the garbage below in the next bump.
146 */
147
148int
149EVP_PKEY_add1_attr_by_NID(EVP_PKEY *pkey, int nid, int type,
150 const unsigned char *bytes, int len)
151{
152 EVPerror(ERR_R_DISABLED);
153 return 0;
154}
155LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_NID);
156
157int
158EVP_PKEY_get_attr_count(const EVP_PKEY *key)
159{
160 EVPerror(ERR_R_DISABLED);
161 return 0;
162}
163LCRYPTO_ALIAS(EVP_PKEY_get_attr_count);
164
165int
166EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos)
167{
168 EVPerror(ERR_R_DISABLED);
169 return -1;
170}
171LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_NID);
172
173int
174EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
175 int lastpos)
176{
177 EVPerror(ERR_R_DISABLED);
178 return -1;
179}
180LCRYPTO_ALIAS(EVP_PKEY_get_attr_by_OBJ);
181
182X509_ATTRIBUTE *
183EVP_PKEY_get_attr(const EVP_PKEY *key, int loc)
184{
185 EVPerror(ERR_R_DISABLED);
186 return NULL;
187}
188LCRYPTO_ALIAS(EVP_PKEY_get_attr);
189
190X509_ATTRIBUTE *
191EVP_PKEY_delete_attr(EVP_PKEY *key, int loc)
192{
193 EVPerror(ERR_R_DISABLED);
194 return NULL;
195}
196LCRYPTO_ALIAS(EVP_PKEY_delete_attr);
197
198int
199EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr)
200{
201 EVPerror(ERR_R_DISABLED);
202 return 0;
203}
204LCRYPTO_ALIAS(EVP_PKEY_add1_attr);
205
206int
207EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, const ASN1_OBJECT *obj, int type,
208 const unsigned char *bytes, int len)
209{
210 EVPerror(ERR_R_DISABLED);
211 return 0;
212}
213LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_OBJ);
214
215int
216EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, const char *attrname, int type,
217 const unsigned char *bytes, int len)
218{
219 EVPerror(ERR_R_DISABLED);
220 return 0;
221}
222LCRYPTO_ALIAS(EVP_PKEY_add1_attr_by_txt);
diff --git a/src/lib/libcrypto/hidden/openssl/x509.h b/src/lib/libcrypto/hidden/openssl/x509.h
index 41045af3ba..e25250d469 100644
--- a/src/lib/libcrypto/hidden/openssl/x509.h
+++ b/src/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.h,v 1.12 2024/08/31 10:16:52 tb Exp $ */ 1/* $OpenBSD: x509.h,v 1.13 2024/08/31 10:25:38 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -440,15 +440,6 @@ LCRYPTO_USED(X509_ocspid_print);
440LCRYPTO_USED(X509_CRL_print); 440LCRYPTO_USED(X509_CRL_print);
441LCRYPTO_USED(X509_REQ_print_ex); 441LCRYPTO_USED(X509_REQ_print_ex);
442LCRYPTO_USED(X509_REQ_print); 442LCRYPTO_USED(X509_REQ_print);
443LCRYPTO_UNUSED(EVP_PKEY_get_attr_count);
444LCRYPTO_UNUSED(EVP_PKEY_get_attr_by_NID);
445LCRYPTO_UNUSED(EVP_PKEY_get_attr_by_OBJ);
446LCRYPTO_UNUSED(EVP_PKEY_get_attr);
447LCRYPTO_UNUSED(EVP_PKEY_delete_attr);
448LCRYPTO_UNUSED(EVP_PKEY_add1_attr);
449LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_OBJ);
450LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_NID);
451LCRYPTO_UNUSED(EVP_PKEY_add1_attr_by_txt);
452LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_new); 443LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_new);
453LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_free); 444LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_free);
454LCRYPTO_USED(d2i_PKCS8_PRIV_KEY_INFO); 445LCRYPTO_USED(d2i_PKCS8_PRIV_KEY_INFO);
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index bcae39aa52..ad3bb0f0f2 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509.h,v 1.116 2024/08/31 10:16:52 tb Exp $ */ 1/* $OpenBSD: x509.h,v 1.117 2024/08/31 10:25:38 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -940,24 +940,6 @@ int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr);
940ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr); 940ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
941ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx); 941ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
942 942
943int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
944int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid,
945 int lastpos);
946int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
947 int lastpos);
948X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
949X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
950int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr);
951int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
952 const ASN1_OBJECT *obj, int type,
953 const unsigned char *bytes, int len);
954int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
955 int nid, int type,
956 const unsigned char *bytes, int len);
957int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
958 const char *attrname, int type,
959 const unsigned char *bytes, int len);
960
961int X509_verify_cert(X509_STORE_CTX *ctx); 943int X509_verify_cert(X509_STORE_CTX *ctx);
962 944
963/* lookup a cert from a X509 STACK */ 945/* lookup a cert from a X509 STACK */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 02:38:32 +0000