diff options
| author | tb <> | 2024-08-31 10:16:52 +0000 |
|---|---|---|
| committer | tb <> | 2024-08-31 10:16:52 +0000 |
| commit | 6b73d9352a214f801122b7ee10c167492ca9e38e (patch) | |
| tree | 621422217196e1ab46333fafca3f2586d119360b /src/lib/libcrypto/x509 | |
| parent | 1c4f8dcbf981963a1c4cfd7ded382d18aaa8fa8a (diff) | |
| download | openbsd-6b73d9352a214f801122b7ee10c167492ca9e38e.tar.gz openbsd-6b73d9352a214f801122b7ee10c167492ca9e38e.tar.bz2 openbsd-6b73d9352a214f801122b7ee10c167492ca9e38e.zip | |
Remove X509_REQ_{set,get}_extension_nids()
LibreSSL no longer supports non-standard OIDs for use in the extensions
attribute of CSRs. The API that enabled that (and nobody used of course)
can now go.
ok beck jsing
Diffstat (limited to 'src/lib/libcrypto/x509')
| -rw-r--r-- | src/lib/libcrypto/x509/x509.h | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_req.c | 21 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 6fcd59a852..bcae39aa52 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.115 2024/08/31 10:14:17 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.116 2024/08/31 10:16:52 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 | * |
| @@ -721,8 +721,6 @@ EVP_PKEY * X509_REQ_get_pubkey(X509_REQ *req); | |||
| 721 | int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp); | 721 | int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp); |
| 722 | EVP_PKEY * X509_REQ_get0_pubkey(X509_REQ *req); | 722 | EVP_PKEY * X509_REQ_get0_pubkey(X509_REQ *req); |
| 723 | int X509_REQ_extension_nid(int nid); | 723 | int X509_REQ_extension_nid(int nid); |
| 724 | int * X509_REQ_get_extension_nids(void); | ||
| 725 | void X509_REQ_set_extension_nids(int *nids); | ||
| 726 | STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req); | 724 | STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req); |
| 727 | int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts, | 725 | int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts, |
| 728 | int nid); | 726 | int nid); |
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c index 2565014972..704acbd897 100644 --- a/src/lib/libcrypto/x509/x509_req.c +++ b/src/lib/libcrypto/x509/x509_req.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_req.c,v 1.42 2024/07/26 13:24:39 tb Exp $ */ | 1 | /* $OpenBSD: x509_req.c,v 1.43 2024/08/31 10:16:52 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 | * |
| @@ -318,22 +318,3 @@ i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) | |||
| 318 | return i2d_X509_REQ_INFO(req->req_info, pp); | 318 | return i2d_X509_REQ_INFO(req->req_info, pp); |
| 319 | } | 319 | } |
| 320 | LCRYPTO_ALIAS(i2d_re_X509_REQ_tbs); | 320 | LCRYPTO_ALIAS(i2d_re_X509_REQ_tbs); |
| 321 | |||
| 322 | /* | ||
| 323 | * XXX - remove the API below in the next major bump | ||
| 324 | */ | ||
| 325 | |||
| 326 | int * | ||
| 327 | X509_REQ_get_extension_nids(void) | ||
| 328 | { | ||
| 329 | X509error(ERR_R_DISABLED); | ||
| 330 | return NULL; | ||
| 331 | } | ||
| 332 | LCRYPTO_ALIAS(X509_REQ_get_extension_nids); | ||
| 333 | |||
| 334 | void | ||
| 335 | X509_REQ_set_extension_nids(int *nids) | ||
| 336 | { | ||
| 337 | X509error(ERR_R_DISABLED); | ||
| 338 | } | ||
| 339 | LCRYPTO_ALIAS(X509_REQ_set_extension_nids); | ||
