Bug 1258375, land final release tag of nss 3.24. Changes version numbers.

This backs out bug 1270836, as it wasn't landed according to NSS procedures. It will be re-landed once we go to a NSS 3.25 beta version.
This commit is contained in:
Kai Engert 2016-05-17 11:00:15 +02:00
parent b6788df19c
commit f586b10fe0
4 changed files with 9 additions and 4 deletions

View File

@ -1 +1 @@
NSS_3_24_RC0
NSS_3_24_RTM

View File

@ -10,3 +10,4 @@
*/
#error "Do not include this header file."

View File

@ -196,8 +196,13 @@ SSL_SetSignedCertTimestamps;
;+};
;+NSS_3.23 { # NSS 3.23 release
;+ global:
SSL_ConfigServerCert;
SSL_SetDowngradeCheckVersion;
;+ local:
;+*;
;+};
;+NSS_3.24 { # NSS 3.24 release
;+ global:
SSL_ConfigServerCert;
;+ local:
;+*;
;+};

View File

@ -451,8 +451,7 @@ ssl_ConfigCertByUsage(sslSocket *ss, CERTCertificate *cert,
return SECFailure;
}
/* |data->authType| has to either agree or be ssl_auth_null. */
if (data && data->authType != ssl_auth_null &&
data->authType != arg.authType) {
if (data->authType != ssl_auth_null && data->authType != arg.authType) {
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return SECFailure;
}