From 624e56f66c29b658165ee56f7d9732f726f07556 Mon Sep 17 00:00:00 2001
From: "J.C. Jones" <jc@mozilla.com>
Date: Fri, 8 Mar 2019 22:44:27 +0000
Subject: [PATCH] Bug 1523175 - land NSS NSS_3_43_BETA1 UPGRADE_NSS_RELEASE,
 r=me

--HG--
extra : rebase_source : eae65b8dc034554ed61a87e2d034ffa8b1d07089
---
 security/nss/TAG-INFO                | 2 +-
 security/nss/coreconf/coreconf.dep   | 1 -
 security/nss/lib/pk11wrap/pk11akey.c | 7 +++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index cf12f5380a54..1c6aab0d5d73 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-a306d84e4c70
+NSS_3_43_BETA1
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
index 590d1bfaeee3..5182f75552c8 100644
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/security/nss/lib/pk11wrap/pk11akey.c b/security/nss/lib/pk11wrap/pk11akey.c
index 97adabb50443..c36f6ce710f6 100644
--- a/security/nss/lib/pk11wrap/pk11akey.c
+++ b/security/nss/lib/pk11wrap/pk11akey.c
@@ -1683,8 +1683,8 @@ SECKEY_SetPublicValue(SECKEYPrivateKey *privKey, SECItem *publicValue)
     SECStatus rv;
     SECKEYPublicKey pubKey;
     PLArenaPool *arena;
-    PK11SlotInfo *slot = privKey->pkcs11Slot;
-    CK_OBJECT_HANDLE privKeyID = privKey->pkcs11ID;
+    PK11SlotInfo *slot;
+    CK_OBJECT_HANDLE privKeyID;
 
     if (privKey == NULL || publicValue == NULL ||
         publicValue->data == NULL || publicValue->len == 0) {
@@ -1704,6 +1704,9 @@ SECKEY_SetPublicValue(SECKEYPrivateKey *privKey, SECItem *publicValue)
     if (arena == NULL) {
         return SECFailure;
     }
+
+    slot = privKey->pkcs11Slot;
+    privKeyID = privKey->pkcs11ID;
     rv = SECFailure;
     switch (privKey->keyType) {
         default: