Bug 453227, fix import cert failure, see comment 80 and 81, update to NSS_3_12_1_RC2, r=wtc

security/nss/lib/nss/nss.h

@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.58 2008/08/11 20:48:30 christophe.ravel.bugs%sun.com Exp $ */
+/* $Id: nss.h,v 1.58.4.1 2008/09/05 17:02:49 kaie%kuix.de Exp $ */
 
 #ifndef __nss_h_
 #define __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

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;