diff options
author | jsing <> | 2015-02-06 08:30:23 +0000 |
---|---|---|
committer | jsing <> | 2015-02-06 08:30:23 +0000 |
commit | 04f5c3dd2b47368b601e30fea9b329d7e90e5233 (patch) | |
tree | 3d9e90980fb8319df5be140e688f4782d92d6aa1 /src/lib/libssl/ssl_locl.h | |
parent | d9fc2c3367b4d3680c1f1fa9d18253a4ba0f42cc (diff) | |
download | openbsd-04f5c3dd2b47368b601e30fea9b329d7e90e5233.tar.gz openbsd-04f5c3dd2b47368b601e30fea9b329d7e90e5233.tar.bz2 openbsd-04f5c3dd2b47368b601e30fea9b329d7e90e5233.zip |
Bring back the horrible API that is get_cipher_by_char/put_cipher_by_char.
This API was intended to be an internal only, however like many things in
OpenSSL, it is exposed externally and parts of the software ecosystem are
now using it since there is no real alternative within the public API.
ok doug@, tedu@ and reluctantly miod@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 3312aebaad..94c0d4a83d 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.84 2014/12/15 00:46:53 doug Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.85 2015/02/06 08:30:23 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 | * |
@@ -595,6 +595,8 @@ STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | |||
595 | int ssl_verify_alarm_type(long type); | 595 | int ssl_verify_alarm_type(long type); |
596 | void ssl_load_ciphers(void); | 596 | void ssl_load_ciphers(void); |
597 | 597 | ||
598 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); | ||
599 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); | ||
598 | int ssl3_init_finished_mac(SSL *s); | 600 | int ssl3_init_finished_mac(SSL *s); |
599 | int ssl3_send_server_certificate(SSL *s); | 601 | int ssl3_send_server_certificate(SSL *s); |
600 | int ssl3_send_newsession_ticket(SSL *s); | 602 | int ssl3_send_newsession_ticket(SSL *s); |