summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/ssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/src/ssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/src/ssl/ssl_locl.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 3c1c444cb0..7961c4c06e 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.63 2014/07/28 04:23:12 guenther Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.64 2014/08/10 14:42:56 jsing 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 *
@@ -475,11 +475,6 @@ typedef struct sess_cert_st {
475/*#define SSL_DEBUG */ 475/*#define SSL_DEBUG */
476/*#define RSA_DEBUG */ 476/*#define RSA_DEBUG */
477 477
478#define ssl_put_cipher_by_char(ssl,ciph,ptr) \
479 ((ssl)->method->put_cipher_by_char((ciph),(ptr)))
480#define ssl_get_cipher_by_char(ssl,ptr) \
481 ((ssl)->method->get_cipher_by_char(ptr))
482
483/* This is for the SSLv3/TLSv1.0 differences in crypto/hash stuff 478/* This is for the SSLv3/TLSv1.0 differences in crypto/hash stuff
484 * It is a bit of a mess of functions, but hell, think of it as 479 * It is a bit of a mess of functions, but hell, think of it as
485 * an opaque structure :-) */ 480 * an opaque structure :-) */
@@ -576,7 +571,7 @@ int ssl_cipher_ptr_id_cmp(const SSL_CIPHER * const *ap,
576STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, 571STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, unsigned char *p,
577 int num, STACK_OF(SSL_CIPHER) **skp); 572 int num, STACK_OF(SSL_CIPHER) **skp);
578int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, 573int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
579 unsigned char *p, int (*put_cb)(const SSL_CIPHER *, unsigned char *)); 574 unsigned char *p);
580STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth, 575STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth,
581 STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted, 576 STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) **sorted,
582 const char *rule_str); 577 const char *rule_str);
@@ -664,7 +659,6 @@ long ssl3_default_timeout(void);
664int ssl23_read(SSL *s, void *buf, int len); 659int ssl23_read(SSL *s, void *buf, int len);
665int ssl23_peek(SSL *s, void *buf, int len); 660int ssl23_peek(SSL *s, void *buf, int len);
666int ssl23_write(SSL *s, const void *buf, int len); 661int ssl23_write(SSL *s, const void *buf, int len);
667int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);
668long ssl23_default_timeout(void); 662long ssl23_default_timeout(void);
669 663
670long tls1_default_timeout(void); 664long tls1_default_timeout(void);