diff options
| author | jsing <> | 2021-04-19 17:26:39 +0000 |
|---|---|---|
| committer | jsing <> | 2021-04-19 17:26:39 +0000 |
| commit | 16295663705b9c018a523267b6d4d6c3a2e71cbb (patch) | |
| tree | dfe7044fc8d9da212fff810e2338ccf80a2643bf /src/lib/libssl/ssl_locl.h | |
| parent | 09d5d7044b93b2ed06d049c8ee912bc45dfa1207 (diff) | |
| download | openbsd-16295663705b9c018a523267b6d4d6c3a2e71cbb.tar.gz openbsd-16295663705b9c018a523267b6d4d6c3a2e71cbb.tar.bz2 openbsd-16295663705b9c018a523267b6d4d6c3a2e71cbb.zip | |
Remove new_sym_enc and new_aead.
These can be replaced with accessors that allow this information to be
retrieved from the new record layer.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index f5287b2580..86d1b6e10b 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.335 2021/04/19 17:03:39 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.336 2021/04/19 17:26:39 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 | * |
| @@ -528,6 +528,8 @@ int tls12_record_layer_write_overhead(struct tls12_record_layer *rl, | |||
| 528 | size_t *overhead); | 528 | size_t *overhead); |
| 529 | int tls12_record_layer_read_protected(struct tls12_record_layer *rl); | 529 | int tls12_record_layer_read_protected(struct tls12_record_layer *rl); |
| 530 | int tls12_record_layer_write_protected(struct tls12_record_layer *rl); | 530 | int tls12_record_layer_write_protected(struct tls12_record_layer *rl); |
| 531 | const EVP_AEAD *tls12_record_layer_aead(struct tls12_record_layer *rl); | ||
| 532 | const EVP_CIPHER *tls12_record_layer_cipher(struct tls12_record_layer *rl); | ||
| 531 | void tls12_record_layer_set_aead(struct tls12_record_layer *rl, | 533 | void tls12_record_layer_set_aead(struct tls12_record_layer *rl, |
| 532 | const EVP_AEAD *aead); | 534 | const EVP_AEAD *aead); |
| 533 | void tls12_record_layer_set_cipher_hash(struct tls12_record_layer *rl, | 535 | void tls12_record_layer_set_cipher_hash(struct tls12_record_layer *rl, |
| @@ -951,9 +953,6 @@ typedef struct ssl3_state_internal_st { | |||
| 951 | char ctype[SSL3_CT_NUMBER]; | 953 | char ctype[SSL3_CT_NUMBER]; |
| 952 | STACK_OF(X509_NAME) *ca_names; | 954 | STACK_OF(X509_NAME) *ca_names; |
| 953 | 955 | ||
| 954 | const EVP_CIPHER *new_sym_enc; | ||
| 955 | const EVP_AEAD *new_aead; | ||
| 956 | |||
| 957 | int cert_request; | 956 | int cert_request; |
| 958 | } tmp; | 957 | } tmp; |
| 959 | 958 | ||
