diff options
| author | reed%reedloden.com <devnull@localhost> | 2008-09-05 18:06:20 +0000 |
|---|---|---|
| committer | reed%reedloden.com <devnull@localhost> | 2008-09-05 18:06:20 +0000 |
| commit | d1d62e8f43d6e2bdf64564a70988ee5618977af0 (patch) | |
| tree | e1ecde2f71d117519a151675d7c2e0b48bb0c9e8 | |
| parent | 362e246f70a838d87db6f2a7e0e4e7441b482714 (diff) | |
| download | nss-hg-FIREFOX_3_0_3_BUILD1.tar.gz | |
Bug 453227 - "Client certificate installation fails" (short term fix for 1.9.0 branch only) [p=nelson@bolyard.com (Nelson Bolyard [MisterSSL]) / kaie@kuix.de (Kai Engert [kaie]) r=kaie r=nelson r+sr=wtc a=dveditz]FIREFOX_3_0_3_RELEASEFIREFOX_3_0_3_BUILD1FIREFOX_3_0_2_RELEASEFIREFOX_3_0_2_BUILD6FIREFOX_3_0_2_BUILD5
| -rw-r--r-- | security/nss/lib/nss/nss.h | 2 | ||||
| -rw-r--r-- | security/nss/lib/pkcs7/certread.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 5273af44e..5e78a7d30 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -70,7 +70,7 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.12.1.0" _NSS_ECC_STRING _NSS_CUSTOMIZED +#define NSS_VERSION "3.12.1.1" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 #define NSS_VMINOR 12 #define NSS_VPATCH 1 diff --git a/security/nss/lib/pkcs7/certread.c b/security/nss/lib/pkcs7/certread.c index 7b229d29e..4e7bd21b7 100644 --- a/security/nss/lib/pkcs7/certread.c +++ b/security/nss/lib/pkcs7/certread.c @@ -332,8 +332,8 @@ notder: while ( cl > NS_CERT_HEADER_LEN ) { if ( !PORT_Strncasecmp((char *)cp, NS_CERT_HEADER, NS_CERT_HEADER_LEN) ) { - cl -= NS_CERT_HEADER_LEN; - cp += NS_CERT_HEADER_LEN; + cl -= NS_CERT_HEADER_LEN + 1; /* skip char after header */ + cp += NS_CERT_HEADER_LEN + 1; /* as all prior versions did. */ certbegin = cp; break; } @@ -353,7 +353,7 @@ notder: if ( certbegin ) { /* find the ending marker */ - while ( cl > NS_CERT_TRAILER_LEN ) { + while ( cl >= NS_CERT_TRAILER_LEN ) { if ( !PORT_Strncasecmp((char *)cp, NS_CERT_TRAILER, NS_CERT_TRAILER_LEN) ) { certend = (unsigned char *)cp; |