diff options
| author | Adam Langley <agl@google.com> | 2015-06-09 00:31:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-09 00:31:54 +0000 |
| commit | 9d4bc055d8634ee6203925335464b4d9bec34be2 (patch) | |
| tree | 2aa613266128178591aa10ef500a92702ddbe054 /src/ssl/d1_lib.c | |
| parent | 907362640544fea73968f6adf34f2b2b5e9b5a00 (diff) | |
| parent | f4e427204234da139fd0585def4b4e22502e33f0 (diff) | |
| download | external_boringssl-9d4bc055d8634ee6203925335464b4d9bec34be2.zip external_boringssl-9d4bc055d8634ee6203925335464b4d9bec34be2.tar.gz external_boringssl-9d4bc055d8634ee6203925335464b4d9bec34be2.tar.bz2 | |
am f4e42720: Bump revision of BoringSSL.
* commit 'f4e427204234da139fd0585def4b4e22502e33f0':
Bump revision of BoringSSL.
Diffstat (limited to 'src/ssl/d1_lib.c')
| -rw-r--r-- | src/ssl/d1_lib.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ssl/d1_lib.c b/src/ssl/d1_lib.c index e53156f..ef7a9c9 100644 --- a/src/ssl/d1_lib.c +++ b/src/ssl/d1_lib.c @@ -151,14 +151,9 @@ void dtls1_free(SSL *s) { s->d1 = NULL; } -const SSL_CIPHER *dtls1_get_cipher(size_t i) { - const SSL_CIPHER *ciph = ssl3_get_cipher(i); +int dtls1_supports_cipher(const SSL_CIPHER *cipher) { /* DTLS does not support stream ciphers. */ - if (ciph == NULL || ciph->algorithm_enc == SSL_RC4) { - return NULL; - } - - return ciph; + return cipher->algorithm_enc != SSL_RC4; } void dtls1_start_timer(SSL *s) { @@ -338,5 +333,5 @@ int dtls1_set_handshake_header(SSL *s, int htype, unsigned long len) { } int dtls1_handshake_write(SSL *s) { - return dtls1_do_write(s, SSL3_RT_HANDSHAKE); + return dtls1_do_write(s, SSL3_RT_HANDSHAKE, dtls1_use_current_epoch); } |