Merge "SRTP: Lower SDES key lifetime minimum to 2^20" into 13

This commit is contained in:
George Joseph
2018-07-18 10:21:18 -05:00
committed by Gerrit Code Review

View File

@@ -322,8 +322,8 @@ int ast_sdp_crypto_process(struct ast_rtp_instance *rtp, struct ast_sdp_srtp *sr
sdes_lifetime = n_lifetime;
}
/* Accept anything above 10 hours. Less than 10; reject. */
if (sdes_lifetime < 1800000) {
/* Accept anything above ~5.8 hours. Less than ~5.8; reject. */
if (sdes_lifetime < 1048576) {
ast_log(LOG_NOTICE, "Rejecting crypto attribute '%s': lifetime '%f' too short\n", attr, sdes_lifetime);
continue;
}