diff options
author | jsing <> | 2017-01-23 10:22:06 +0000 |
---|---|---|
committer | jsing <> | 2017-01-23 10:22:06 +0000 |
commit | 034e1f9018bedb7d71df3286551c19fa5bd18c07 (patch) | |
tree | 45f8733f12cae1ed103f7565222351ce0be8ccda /src/lib/libssl/ssl.h | |
parent | 61af17199189570a4400f2757a9e8dab4bb76d2a (diff) | |
download | openbsd-034e1f9018bedb7d71df3286551c19fa5bd18c07.tar.gz openbsd-034e1f9018bedb7d71df3286551c19fa5bd18c07.tar.bz2 openbsd-034e1f9018bedb7d71df3286551c19fa5bd18c07.zip |
Remove ssl_ctrl, ssl_ctx_ctrl, ssl_callback_ctrl and ssl_ctx_callback_ctrl
from SSL_METHOD, replacing usage with direct calls to the appropriate
functions.
ok beck@
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index f29626dc03..87237fcc9b 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.116 2017/01/23 08:48:44 beck Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.117 2017/01/23 10:22:06 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 | * |
@@ -417,8 +417,6 @@ struct ssl_method_st { | |||
417 | int len, int peek); | 417 | int len, int peek); |
418 | int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len); | 418 | int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len); |
419 | int (*ssl_dispatch_alert)(SSL *s); | 419 | int (*ssl_dispatch_alert)(SSL *s); |
420 | long (*ssl_ctrl)(SSL *s, int cmd, long larg, void *parg); | ||
421 | long (*ssl_ctx_ctrl)(SSL_CTX *ctx, int cmd, long larg, void *parg); | ||
422 | const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr); | 420 | const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr); |
423 | int (*put_cipher_by_char)(const SSL_CIPHER *cipher, unsigned char *ptr); | 421 | int (*put_cipher_by_char)(const SSL_CIPHER *cipher, unsigned char *ptr); |
424 | int (*ssl_pending)(const SSL *s); | 422 | int (*ssl_pending)(const SSL *s); |
@@ -428,8 +426,6 @@ struct ssl_method_st { | |||
428 | long (*get_timeout)(void); | 426 | long (*get_timeout)(void); |
429 | struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */ | 427 | struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */ |
430 | int (*ssl_version)(void); | 428 | int (*ssl_version)(void); |
431 | long (*ssl_callback_ctrl)(SSL *s, int cb_id, void (*fp)(void)); | ||
432 | long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void)); | ||
433 | }; | 429 | }; |
434 | 430 | ||
435 | /* Lets make this into an ASN.1 type structure as follows | 431 | /* Lets make this into an ASN.1 type structure as follows |