Merge pull request #1411 from ejohnstown/dtls-null-fix

DTLS Import/Export with Null Cipher
pull/1414/head
toddouska 2018-03-02 11:41:04 -08:00 committed by GitHub
commit 2c12b0d678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -1314,8 +1314,9 @@ int wolfSSL_dtls_import_internal(WOLFSSL* ssl, byte* buf, word32 sz)
return MATCH_SUITE_ERROR;
}
/* do not allow stream ciphers with DTLS */
if (ssl->specs.cipher_type == stream) {
/* do not allow stream ciphers with DTLS, except for NULL cipher */
if (ssl->specs.cipher_type == stream &&
ssl->specs.bulk_cipher_algorithm != wolfssl_cipher_null) {
WOLFSSL_MSG("Can not import stream ciphers for DTLS");
return SANITY_CIPHER_E;
}