зеркало из https://github.com/mozilla/pjs.git
Fix bug 160207 by changing the error alerts we send for failed decryption.
This commit is contained in:
Родитель
2919131260
Коммит
25b06b0922
|
@ -33,7 +33,7 @@
|
|||
* may use your version of this file under either the MPL or the
|
||||
* GPL.
|
||||
*
|
||||
* $Id: ssl3con.c,v 1.38 2002-06-25 23:00:59 relyea%netscape.com Exp $
|
||||
* $Id: ssl3con.c,v 1.39 2002-08-07 20:01:51 nelsonb%netscape.com Exp $
|
||||
*/
|
||||
|
||||
#include "nssrenam.h"
|
||||
|
@ -7448,8 +7448,8 @@ const ssl3BulkCipherDef *cipher_def;
|
|||
if (rv != SECSuccess) {
|
||||
ssl_ReleaseSpecReadLock(ss);
|
||||
ssl_MapLowLevelError(SSL_ERROR_DECRYPTION_FAILURE);
|
||||
if (isTLS)
|
||||
(void)SSL3_SendAlert(ss, alert_fatal, decryption_failed);
|
||||
SSL3_SendAlert(ss, alert_fatal,
|
||||
isTLS ? decryption_failed : bad_record_mac);
|
||||
ssl_MapLowLevelError(SSL_ERROR_DECRYPTION_FAILURE);
|
||||
return SECFailure;
|
||||
}
|
||||
|
@ -7469,9 +7469,8 @@ const ssl3BulkCipherDef *cipher_def;
|
|||
bad_pad:
|
||||
/* must not hold spec lock when calling SSL3_SendAlert. */
|
||||
ssl_ReleaseSpecReadLock(ss);
|
||||
/* SSL3 doesn't have an alert for bad padding, so use bad mac. */
|
||||
SSL3_SendAlert(ss, alert_fatal,
|
||||
isTLS ? decryption_failed : bad_record_mac);
|
||||
/* SSL3 & TLS must send bad_record_mac if padding check fails. */
|
||||
SSL3_SendAlert(ss, alert_fatal, bad_record_mac);
|
||||
PORT_SetError(SSL_ERROR_BAD_BLOCK_PADDING);
|
||||
return SECFailure;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче