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.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.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 275743a6a0..571786dcf6 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.79 2015/02/06 01:37:11 reyk Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.80 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 | * |
@@ -418,6 +418,8 @@ struct ssl_method_st { | |||
418 | int (*ssl_dispatch_alert)(SSL *s); | 418 | int (*ssl_dispatch_alert)(SSL *s); |
419 | long (*ssl_ctrl)(SSL *s, int cmd, long larg, void *parg); | 419 | long (*ssl_ctrl)(SSL *s, int cmd, long larg, void *parg); |
420 | long (*ssl_ctx_ctrl)(SSL_CTX *ctx, int cmd, long larg, void *parg); | 420 | long (*ssl_ctx_ctrl)(SSL_CTX *ctx, int cmd, long larg, void *parg); |
421 | const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr); | ||
422 | int (*put_cipher_by_char)(const SSL_CIPHER *cipher, unsigned char *ptr); | ||
421 | int (*ssl_pending)(const SSL *s); | 423 | int (*ssl_pending)(const SSL *s); |
422 | int (*num_ciphers)(void); | 424 | int (*num_ciphers)(void); |
423 | const SSL_CIPHER *(*get_cipher)(unsigned ncipher); | 425 | const SSL_CIPHER *(*get_cipher)(unsigned ncipher); |