Commit c951c5c4 authored by Brian Smith's avatar Brian Smith
Browse files

Bug 713936: Update to NSS_3_13_2_RTM (NSS 3.13.2), r=kai

parent 5bd860a3
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -42,3 +42,4 @@
 */

#error "Do not include this header file."
+1 −1
Original line number Diff line number Diff line
NSS_3_13_2_RC0
NSS_3_13_2_RTM
+2 −1
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ ownAuthCertificate(void *arg, PRFileDesc *fd, PRBool checkSig,
{
    ServerCertAuth * serverCertAuth = (ServerCertAuth *) arg;

    FPRINTF(stderr, "using asynchronous certificate validation\n");
    FPRINTF(stderr, "%s: using asynchronous certificate validation\n",
	    progName);

    PORT_Assert(serverCertAuth->shouldPause);
    PORT_Assert(!serverCertAuth->isPaused);
+3 −3
Original line number Diff line number Diff line
@@ -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.88 2012/02/13 21:34:08 kaie%kuix.de Exp $ */
/* $Id: nss.h,v 1.89 2012/02/15 21:56:55 kaie%kuix.de Exp $ */

#ifndef __nss_h_
#define __nss_h_
@@ -66,11 +66,11 @@
 * The format of the version string should be
 *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
 */
#define NSS_VERSION  "3.13.2.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VERSION  "3.13.2.1" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR   3
#define NSS_VMINOR   13
#define NSS_VPATCH   2
#define NSS_VBUILD   0
#define NSS_VBUILD   1
#define NSS_BETA     PR_FALSE

#ifndef RC_INVOKED
+2 −2
Original line number Diff line number Diff line
@@ -57,11 +57,11 @@
 * The format of the version string should be
 *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
 */
#define SOFTOKEN_VERSION  "3.13.2.0" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VERSION  "3.13.2.1" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR   3
#define SOFTOKEN_VMINOR   13
#define SOFTOKEN_VPATCH   2
#define SOFTOKEN_VBUILD   0
#define SOFTOKEN_VBUILD   1
#define SOFTOKEN_BETA     PR_FALSE

#endif /* _SOFTKVER_H_ */
Loading