summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelson%bolyard.com <devnull@localhost>2008-09-05 16:50:04 +0000
committernelson%bolyard.com <devnull@localhost>2008-09-05 16:50:04 +0000
commit8ec549cdebbf642b295fb882b23e322f3181c3cb (patch)
treec8ac6481ac6339b6f1eaf16e6e0918da9207a931
parentf408365b757927d298c3f9375a4b2a2d74497835 (diff)
downloadnss-hg-8ec549cdebbf642b295fb882b23e322f3181c3cb.tar.gz
Bug 453227: Client certificate installation fails, r=kaie,wtc a=beltzner
-rw-r--r--security/nss/lib/pkcs7/certread.c6
1 files changed, 3 insertions, 3 deletions
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;