summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl_locl.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 8567c51c67..50806d1b18 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.223 2018/11/09 00:34:55 beck Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.224 2018/11/10 01:19:09 beck 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 *
@@ -161,6 +161,7 @@
161#include <openssl/stack.h> 161#include <openssl/stack.h>
162 162
163#include "bytestring.h" 163#include "bytestring.h"
164#include "ssl_sigalgs.h"
164 165
165__BEGIN_HIDDEN_DECLS 166__BEGIN_HIDDEN_DECLS
166 167
@@ -930,8 +931,8 @@ typedef struct dtls1_state_internal_st {
930typedef struct cert_pkey_st { 931typedef struct cert_pkey_st {
931 X509 *x509; 932 X509 *x509;
932 EVP_PKEY *privatekey; 933 EVP_PKEY *privatekey;
933 /* Digest to use when signing */ 934 /* sigalg to use when signing */
934 const EVP_MD *digest; 935 const struct ssl_sigalg *sigalg;
935} CERT_PKEY; 936} CERT_PKEY;
936 937
937typedef struct cert_st { 938typedef struct cert_st {
@@ -1076,7 +1077,8 @@ int ssl_undefined_void_function(void);
1076int ssl_undefined_const_function(const SSL *s); 1077int ssl_undefined_const_function(const SSL *s);
1077CERT_PKEY *ssl_get_server_send_pkey(const SSL *s); 1078CERT_PKEY *ssl_get_server_send_pkey(const SSL *s);
1078X509 *ssl_get_server_send_cert(const SSL *); 1079X509 *ssl_get_server_send_cert(const SSL *);
1079EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd); 1080EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd,
1081 const struct ssl_sigalg **sap);
1080DH *ssl_get_auto_dh(SSL *s); 1082DH *ssl_get_auto_dh(SSL *s);
1081int ssl_cert_type(X509 *x, EVP_PKEY *pkey); 1083int ssl_cert_type(X509 *x, EVP_PKEY *pkey);
1082void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher); 1084void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher);