1 files changed, 45 insertions, 45 deletions

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 5361704d70..e8c277ec60 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.376 2022/01/07 16:45:06 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.377 2022/01/08 12:43:44 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -361,6 +361,34 @@ __BEGIN_HIDDEN_DECLS
 #define EXPLICIT_CHAR2_CURVE_TYPE  2
 #define NAMED_CURVE_TYPE           3
 
+typedef struct ssl_cert_pkey_st {
+        X509 *x509;
+        EVP_PKEY *privatekey;
+        STACK_OF(X509) *chain;
+} SSL_CERT_PKEY;
+
+typedef struct ssl_cert_st {
+        /* Current active set */
+        /* ALWAYS points to an element of the pkeys array
+         * Probably it would make more sense to store
+         * an index, not a pointer. */
+        SSL_CERT_PKEY *key;
+
+        SSL_CERT_PKEY pkeys[SSL_PKEY_NUM];
+
+        /* The following masks are for the key and auth
+         * algorithms that are supported by the certs below */
+        int valid;
+        unsigned long mask_k;
+        unsigned long mask_a;
+
+        DH *dhe_params;
+        DH *(*dhe_params_cb)(SSL *ssl, int is_export, int keysize);
+        int dhe_params_auto;
+
+        int references; /* >1 only if SSL_copy_session_id is used */
+} SSL_CERT;
+
 struct ssl_comp_st {
         int id;
         const char *name;
@@ -498,12 +526,6 @@ struct ssl_session_st {
         uint16_t *tlsext_supportedgroups; /* peer's list */
 };
 
-typedef struct cert_pkey_st {
-        X509 *x509;
-        EVP_PKEY *privatekey;
-        STACK_OF(X509) *chain;
-} CERT_PKEY;
-
 struct ssl_sigalg;
 
 typedef struct ssl_handshake_tls12_st {
@@ -533,7 +555,7 @@ typedef struct ssl_handshake_tls13_st {
         int hrr;
 
         /* Certificate selected for use (static pointer). */
-        const CERT_PKEY *cpk;
+        const SSL_CERT_PKEY *cpk;
 
         /* Version proposed by peer server. */
         uint16_t server_version;
@@ -785,7 +807,7 @@ typedef struct ssl_ctx_internal_st {
 
         STACK_OF(SSL_CIPHER) *cipher_list_tls13;
 
-        struct cert_st /* CERT */ *cert;
+        SSL_CERT *cert;
 
         /* Default values used when no per-SSL value is defined follow */
 
@@ -1058,7 +1080,7 @@ struct ssl_st {
         STACK_OF(SSL_CIPHER) *cipher_list;
 
         /* This is used to hold the server certificate used */
-        struct cert_st /* CERT */ *cert;
+        SSL_CERT *cert;
 
         /* the session_id_context is used to ensure sessions are only reused
          * in the appropriate context */
@@ -1200,38 +1222,16 @@ typedef struct ssl3_state_st {
         struct ssl3_state_internal_st *internal;
 } SSL3_STATE;
 
-typedef struct cert_st {
-        /* Current active set */
-        CERT_PKEY *key; /* ALWAYS points to an element of the pkeys array
-                         * Probably it would make more sense to store
-                         * an index, not a pointer. */
-
-        /* The following masks are for the key and auth
-         * algorithms that are supported by the certs below */
-        int valid;
-        unsigned long mask_k;
-        unsigned long mask_a;
-
-        DH *dhe_params;
-        DH *(*dhe_params_cb)(SSL *ssl, int is_export, int keysize);
-        int dhe_params_auto;
-
-        CERT_PKEY pkeys[SSL_PKEY_NUM];
-
-        int references; /* >1 only if SSL_copy_session_id is used */
-} CERT;
-
-
 typedef struct sess_cert_st {
         STACK_OF(X509) *cert_chain; /* as received from peer */
 
         /* The 'peer_...' members are used only by clients. */
         int peer_cert_type;
 
-        CERT_PKEY *peer_key; /* points to an element of peer_pkeys (never NULL!) */
-        CERT_PKEY peer_pkeys[SSL_PKEY_NUM];
+        SSL_CERT_PKEY *peer_key; /* points to an element of peer_pkeys (never NULL!) */
+        SSL_CERT_PKEY peer_pkeys[SSL_PKEY_NUM];
         /* Obviously we don't have the private keys of these,
-         * so maybe we shouldn't even use the CERT_PKEY type here. */
+         * so maybe we shouldn't even use the SSL_CERT_PKEY type here. */
 
         int references; /* actually always 1 at the moment */
 } SESS_CERT;
@@ -1293,13 +1293,13 @@ void ssl_info_callback(const SSL *s, int type, int value);
 void ssl_msg_callback(SSL *s, int is_write, int content_type,
     const void *msg_buf, size_t msg_len);
 
-CERT *ssl_cert_new(void);
-CERT *ssl_cert_dup(CERT *cert);
-void ssl_cert_free(CERT *c);
-int ssl_cert_set0_chain(CERT *c, STACK_OF(X509) *chain);
-int ssl_cert_set1_chain(CERT *c, STACK_OF(X509) *chain);
-int ssl_cert_add0_chain_cert(CERT *c, X509 *cert);
-int ssl_cert_add1_chain_cert(CERT *c, X509 *cert);
+SSL_CERT *ssl_cert_new(void);
+SSL_CERT *ssl_cert_dup(SSL_CERT *cert);
+void ssl_cert_free(SSL_CERT *c);
+int ssl_cert_set0_chain(SSL_CERT *c, STACK_OF(X509) *chain);
+int ssl_cert_set1_chain(SSL_CERT *c, STACK_OF(X509) *chain);
+int ssl_cert_add0_chain_cert(SSL_CERT *c, X509 *cert);
+int ssl_cert_add1_chain_cert(SSL_CERT *c, X509 *cert);
 
 SESS_CERT *ssl_sess_cert_new(void);
 void ssl_sess_cert_free(SESS_CERT *sc);
@@ -1328,12 +1328,12 @@ int ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk);
 int ssl_undefined_function(SSL *s);
 int ssl_undefined_void_function(void);
 int ssl_undefined_const_function(const SSL *s);
-CERT_PKEY *ssl_get_server_send_pkey(const SSL *s);
+SSL_CERT_PKEY *ssl_get_server_send_pkey(const SSL *s);
 EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd,
     const struct ssl_sigalg **sap);
 size_t ssl_dhe_params_auto_key_bits(SSL *s);
 int ssl_cert_type(X509 *x, EVP_PKEY *pkey);
-void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher);
+void ssl_set_cert_masks(SSL_CERT *c, const SSL_CIPHER *cipher);
 STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
 int ssl_has_ecc_ciphers(SSL *s);
 int ssl_verify_alarm_type(long type);
@@ -1365,7 +1365,7 @@ void ssl_force_want_read(SSL *s);
 int ssl3_dispatch_alert(SSL *s);
 int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);
 int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
-int ssl3_output_cert_chain(SSL *s, CBB *cbb, CERT_PKEY *cpk);
+int ssl3_output_cert_chain(SSL *s, CBB *cbb, SSL_CERT_PKEY *cpk);
 SSL_CIPHER *ssl3_choose_cipher(SSL *ssl, STACK_OF(SSL_CIPHER) *clnt,
     STACK_OF(SSL_CIPHER) *srvr);
 int     ssl3_setup_buffers(SSL *s);