diff options
| author | nelson%bolyard.com <devnull@localhost> | 2008-09-30 00:32:33 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2008-09-30 00:32:33 +0000 |
| commit | a7a298f1f8f3fc6aea4d02eb4d55f53ddfa65880 (patch) | |
| tree | af7230f67b82439896eeb6ba6beb364af3956cdf | |
| parent | f089545ca5708014b6f78ad370bfafa200393963 (diff) | |
| download | nss-hg-a7a298f1f8f3fc6aea4d02eb4d55f53ddfa65880.tar.gz | |
Carry the diffs between NSS_3_12_1_RC1 and NSS_3_12_1_RC2 to the trunk
from the "mini" NSS_3_12_1_BRANCH.
| -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 8246f99d8..a158facfa 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; |