diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index a198b23202..729a06d0ed 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.121 2025/03/09 15:17:22 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.123 2025/07/16 15:59:26 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 | * |
@@ -178,6 +178,7 @@ DECLARE_STACK_OF(X509) | |||
178 | #define X509_FLAG_NO_SIGDUMP (1L << 9) | 178 | #define X509_FLAG_NO_SIGDUMP (1L << 9) |
179 | #define X509_FLAG_NO_AUX (1L << 10) | 179 | #define X509_FLAG_NO_AUX (1L << 10) |
180 | #define X509_FLAG_NO_ATTRIBUTES (1L << 11) | 180 | #define X509_FLAG_NO_ATTRIBUTES (1L << 11) |
181 | #define X509_FLAG_NO_IDS (1L << 12) | ||
181 | 182 | ||
182 | /* Flags specific to X509_NAME_print_ex() */ | 183 | /* Flags specific to X509_NAME_print_ex() */ |
183 | 184 | ||
@@ -244,23 +245,7 @@ typedef struct X509_crl_info_st X509_CRL_INFO; | |||
244 | DECLARE_STACK_OF(X509_CRL) | 245 | DECLARE_STACK_OF(X509_CRL) |
245 | 246 | ||
246 | typedef struct private_key_st { | 247 | typedef struct private_key_st { |
247 | int version; | ||
248 | /* The PKCS#8 data types */ | ||
249 | X509_ALGOR *enc_algor; | ||
250 | ASN1_OCTET_STRING *enc_pkey; /* encrypted pub key */ | ||
251 | |||
252 | /* When decrypted, the following will not be NULL */ | ||
253 | EVP_PKEY *dec_pkey; | 248 | EVP_PKEY *dec_pkey; |
254 | |||
255 | /* used to encrypt and decrypt */ | ||
256 | int key_length; | ||
257 | char *key_data; | ||
258 | int key_free; /* true if we should auto free key_data */ | ||
259 | |||
260 | /* expanded version of 'enc_algor' */ | ||
261 | EVP_CIPHER_INFO cipher; | ||
262 | |||
263 | int references; | ||
264 | } X509_PKEY; | 249 | } X509_PKEY; |
265 | 250 | ||
266 | #ifndef OPENSSL_NO_EVP | 251 | #ifndef OPENSSL_NO_EVP |
@@ -646,9 +631,6 @@ int X509_CRL_get0_by_serial(X509_CRL *crl, | |||
646 | X509_REVOKED **ret, ASN1_INTEGER *serial); | 631 | X509_REVOKED **ret, ASN1_INTEGER *serial); |
647 | int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x); | 632 | int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x); |
648 | 633 | ||
649 | X509_PKEY * X509_PKEY_new(void ); | ||
650 | void X509_PKEY_free(X509_PKEY *a); | ||
651 | |||
652 | NETSCAPE_SPKI *NETSCAPE_SPKI_new(void); | 634 | NETSCAPE_SPKI *NETSCAPE_SPKI_new(void); |
653 | void NETSCAPE_SPKI_free(NETSCAPE_SPKI *a); | 635 | void NETSCAPE_SPKI_free(NETSCAPE_SPKI *a); |
654 | NETSCAPE_SPKI *d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a, const unsigned char **in, long len); | 636 | NETSCAPE_SPKI *d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a, const unsigned char **in, long len); |