diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index bff28b1772..6834592516 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.169 2017/01/26 05:31:25 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.170 2017/01/26 06:32:58 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 | * |
@@ -1012,28 +1012,8 @@ typedef struct sess_cert_st { | |||
1012 | /*#define SSL_DEBUG */ | 1012 | /*#define SSL_DEBUG */ |
1013 | /*#define RSA_DEBUG */ | 1013 | /*#define RSA_DEBUG */ |
1014 | 1014 | ||
1015 | /* This is for the SSLv3/TLSv1.0 differences in crypto/hash stuff | ||
1016 | * It is a bit of a mess of functions, but hell, think of it as | ||
1017 | * an opaque structure :-) */ | ||
1018 | typedef struct ssl3_enc_method { | 1015 | typedef struct ssl3_enc_method { |
1019 | int (*enc)(SSL *, int); | 1016 | int (*enc)(SSL *, int); |
1020 | int (*mac)(SSL *, unsigned char *, int); | ||
1021 | int (*setup_key_block)(SSL *); | ||
1022 | int (*generate_master_secret)(SSL *, unsigned char *, | ||
1023 | unsigned char *, int); | ||
1024 | int (*change_cipher_state)(SSL *, int); | ||
1025 | int (*final_finish_mac)(SSL *, const char *, int, unsigned char *); | ||
1026 | int finish_mac_length; | ||
1027 | int (*cert_verify_mac)(SSL *, int, unsigned char *); | ||
1028 | const char *client_finished_label; | ||
1029 | int client_finished_label_len; | ||
1030 | const char *server_finished_label; | ||
1031 | int server_finished_label_len; | ||
1032 | int (*alert_value)(int); | ||
1033 | int (*export_keying_material)(SSL *, unsigned char *, size_t, | ||
1034 | const char *, size_t, const unsigned char *, size_t, | ||
1035 | int use_context); | ||
1036 | /* Flags indicating protocol version requirements. */ | ||
1037 | unsigned int enc_flags; | 1017 | unsigned int enc_flags; |
1038 | } SSL3_ENC_METHOD; | 1018 | } SSL3_ENC_METHOD; |
1039 | 1019 | ||