diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509.h')
| -rw-r--r-- | src/lib/libcrypto/x509/x509.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index e779dfb6a9..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.122 2025/07/01 06:35:16 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 | * |
| @@ -245,23 +245,7 @@ typedef struct X509_crl_info_st X509_CRL_INFO; | |||
| 245 | DECLARE_STACK_OF(X509_CRL) | 245 | DECLARE_STACK_OF(X509_CRL) |
| 246 | 246 | ||
| 247 | typedef struct private_key_st { | 247 | typedef struct private_key_st { |
| 248 | int version; | ||
| 249 | /* The PKCS#8 data types */ | ||
| 250 | X509_ALGOR *enc_algor; | ||
| 251 | ASN1_OCTET_STRING *enc_pkey; /* encrypted pub key */ | ||
| 252 | |||
| 253 | /* When decrypted, the following will not be NULL */ | ||
| 254 | EVP_PKEY *dec_pkey; | 248 | EVP_PKEY *dec_pkey; |
| 255 | |||
| 256 | /* used to encrypt and decrypt */ | ||
| 257 | int key_length; | ||
| 258 | char *key_data; | ||
| 259 | int key_free; /* true if we should auto free key_data */ | ||
| 260 | |||
| 261 | /* expanded version of 'enc_algor' */ | ||
| 262 | EVP_CIPHER_INFO cipher; | ||
| 263 | |||
| 264 | int references; | ||
| 265 | } X509_PKEY; | 249 | } X509_PKEY; |
| 266 | 250 | ||
| 267 | #ifndef OPENSSL_NO_EVP | 251 | #ifndef OPENSSL_NO_EVP |
| @@ -647,9 +631,6 @@ int X509_CRL_get0_by_serial(X509_CRL *crl, | |||
| 647 | X509_REVOKED **ret, ASN1_INTEGER *serial); | 631 | X509_REVOKED **ret, ASN1_INTEGER *serial); |
| 648 | 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); |
| 649 | 633 | ||
| 650 | X509_PKEY * X509_PKEY_new(void ); | ||
| 651 | void X509_PKEY_free(X509_PKEY *a); | ||
| 652 | |||
| 653 | NETSCAPE_SPKI *NETSCAPE_SPKI_new(void); | 634 | NETSCAPE_SPKI *NETSCAPE_SPKI_new(void); |
| 654 | void NETSCAPE_SPKI_free(NETSCAPE_SPKI *a); | 635 | void NETSCAPE_SPKI_free(NETSCAPE_SPKI *a); |
| 655 | 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); |
