diff options
| author | Adam Langley <agl@google.com> | 2015-01-21 05:47:14 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-01-22 22:27:30 +0300 |
| commit | 66850ddec105f0be7bba400e64debb56f3e21104 (patch) | |
| tree | 5938ca3c2356ebe6c2bdee719afb07d17baa3acf | |
| parent | 384673ceb7a8160e6ef836eda0382de60b781b5c (diff) | |
Add dummy variables to keep wpa_supplicant happy.
Since we can't update wpa_supplicant nearly as fast as we would like, we
need to try and keep it happy. Unfortunately, the recent switch to
EVP_AEAD breaks it so this dismal change adds some dummy variables that
will allow it to compile.
Change-Id: I03d6b81c30bbebc07af3af0d6cda85a26b461edf
Reviewed-on: https://boringssl-review.googlesource.com/2960
Reviewed-by: Adam Langley <agl@google.com>
| -rw-r--r-- | include/openssl/ssl.h | 6 | ||||
| -rw-r--r-- | include/openssl/ssl3.h | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 3b3d1145..bf3923e4 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1377,6 +1377,12 @@ struct ssl_st * bytes. This ensures that the cellular radio is fast forwarded to DCH * (high data rate) state in 3G networks. */ char fastradio_padding; + + /* These fields are always NULL and exist only to keep wpa_supplicant + * happy about the change to EVP_AEAD. They are only needed for + * EAP-FAST, which we don't support. */ + EVP_CIPHER_CTX *enc_read_ctx; + EVP_MD_CTX *read_hash; }; #endif diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index c502b5a8..0b3ad353 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -502,6 +502,11 @@ typedef struct ssl3_state_st /* Client-only: peer_psk_identity_hint is the psk_identity_hint * sent by the server when using a PSK key exchange. */ char *peer_psk_identity_hint; + + /* new_mac_secret_size is unused and exists only until + * wpa_supplicant can be updated. It is only needed for + * EAP-FAST, which we don't support. */ + uint8_t new_mac_secret_size; } tmp; /* Connection binding to prevent renegotiation attacks */ |