From cc14b39c934deab1df4431fbc8377a4ef6e48cf7 Mon Sep 17 00:00:00 2001
From: "nelsonb%netscape.com"
 <nelsonb%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 11 Apr 2001 22:49:07 +0000
Subject: [PATCH] Merge in NSS 3.2.1 changes.

git-svn-id: svn://10.0.0.236/trunk@92007 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/smime/smime.def   |  6 +++++
 mozilla/security/nss/lib/smime/smimeutil.c | 27 +++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/mozilla/security/nss/lib/smime/smime.def b/mozilla/security/nss/lib/smime/smime.def
index f1c0f293dad..31bf8d4aeeb 100644
--- a/mozilla/security/nss/lib/smime/smime.def
+++ b/mozilla/security/nss/lib/smime/smime.def
@@ -169,3 +169,9 @@ SEC_PKCS12SetPreferredCipher;
 ;+    local:
 ;+        *;
 ;+};
+;+NSS_3.2.1 {               # NSS 3.2.1 release
+;+    global:
+NSSSMIME_VersionCheck;
+;+    local:
+;+        *;
+;+};
diff --git a/mozilla/security/nss/lib/smime/smimeutil.c b/mozilla/security/nss/lib/smime/smimeutil.c
index e74ca66752c..9e78c3adfc6 100644
--- a/mozilla/security/nss/lib/smime/smimeutil.c
+++ b/mozilla/security/nss/lib/smime/smimeutil.c
@@ -34,7 +34,7 @@
 /*
  * Stuff specific to S/MIME policy and interoperability.
  *
- * $Id: smimeutil.c,v 1.5 2001-01-07 08:13:07 nelsonb%netscape.com Exp $
+ * $Id: smimeutil.c,v 1.6 2001-04-11 22:49:07 nelsonb%netscape.com Exp $
  */
 
 #include "secmime.h"
@@ -715,3 +715,28 @@ loser:
 
     return cert;
 }
+
+extern const char __nss_smime_rcsid[];
+extern const char __nss_smime_sccsid[];
+
+PRBool
+NSSSMIME_VersionCheck(const char *importedVersion)
+{
+    /*
+     * This is the secret handshake algorithm.
+     *
+     * This release has a simple version compatibility
+     * check algorithm.  This release is not backward
+     * compatible with previous major releases.  It is
+     * not compatible with future major, minor, or
+     * patch releases.
+     */
+    int vmajor = 0, vminor = 0, vpatch = 0;
+    const char *ptr = importedVersion;
+    volatile char c; /* force a reference that won't get optimized away */
+
+    c = __nss_smime_rcsid[0] + __nss_smime_sccsid[0]; 
+
+    return NSS_VersionCheck(importedVersion);
+}
+