From b90d1be66eaa440cb83ecddfd360064bea45ad5f Mon Sep 17 00:00:00 2001
From: "nelsonb%netscape.com" <nelsonb%netscape.com>
Date: Wed, 11 Apr 2001 22:42:28 +0000
Subject: [PATCH] Merge in NSS 3.2.1 changes into nss.def.  Update version to
 3.3 Beta.

---
 security/nss/lib/nss/nss.def | 9 +++++++++
 security/nss/lib/nss/nss.h   | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index be658f7e553..e0b64713245 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -448,6 +448,15 @@ PK11_NeedUserInit;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.2.1 {       # NSS 3.2 release
+;+    global:
+CERT_AddRDN;
+CERT_CreateRDN;
+CERT_CreateAVA;
+CERT_CreateName;
+;+    local:
+;+       *;
+;+};
 ;+NSS_3.3 { 	# NSS 3.3. release
 ;+    global:
 SECKEY_CreateDHPrivateKey;
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 429e2a838d7..7e2fda4c183 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: nss.h,v 1.9 2001-02-10 02:02:57 relyea%netscape.com Exp $
+ * $Id: nss.h,v 1.10 2001-04-11 22:42:28 nelsonb%netscape.com Exp $
  */
 
 #ifndef __nss_h_
@@ -49,11 +49,11 @@ SEC_BEGIN_PROTOS
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>] [<Beta>]"
  */
-#define NSS_VERSION  "3.2"
+#define NSS_VERSION  "3.3 Beta"
 #define NSS_VMAJOR   3
-#define NSS_VMINOR   2
+#define NSS_VMINOR   3
 #define NSS_VPATCH   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 
 /*