summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authordoug <>2015-07-24 07:57:48 +0000
committerdoug <>2015-07-24 07:57:48 +0000
commit7947eb00ec87714f4767a7da1487491559eb9f11 (patch)
tree4c37df21595a6a457d58d344bc65089bf8a0e864 /src/lib/libssl/ssl_locl.h
parentf81ac49bb30eb3dff10b31b642500814f0c6a464 (diff)
downloadopenbsd-7947eb00ec87714f4767a7da1487491559eb9f11.tar.gz
openbsd-7947eb00ec87714f4767a7da1487491559eb9f11.tar.bz2
openbsd-7947eb00ec87714f4767a7da1487491559eb9f11.zip
Convert tls1_process_ticket to CBS.
ok miod@ jsing@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index d05ef600e5..74b699a48c 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.99 2015/07/19 07:30:06 doug Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.100 2015/07/24 07:57:48 doug 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 *
@@ -825,9 +825,8 @@ int ssl_check_clienthello_tlsext_late(SSL *s);
825int ssl_check_serverhello_tlsext(SSL *s); 825int ssl_check_serverhello_tlsext(SSL *s);
826 826
827#define tlsext_tick_md EVP_sha256 827#define tlsext_tick_md EVP_sha256
828int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, 828int tls1_process_ticket(SSL *s, const unsigned char *session_id, int len,
829 const unsigned char *limit, SSL_SESSION **ret); 829 const unsigned char *limit, SSL_SESSION **ret);
830
831int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, 830int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
832 const EVP_MD *md); 831 const EVP_MD *md);
833int tls12_get_sigid(const EVP_PKEY *pk); 832int tls12_get_sigid(const EVP_PKEY *pk);