diff -r 000000000000 -r 6474c204b198 security/manager/ssl/src/nsPK11TokenDB.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/ssl/src/nsPK11TokenDB.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __NS_PK11TOKENDB_H__
+#define __NS_PK11TOKENDB_H__
+
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include "nsISupports.h"
+#include "nsIPK11TokenDB.h"
+#include "nsIPK11Token.h"
+#include "nsNSSHelper.h"
+#include "pk11func.h"
+#include "nsNSSShutDown.h"
+
+class nsPK11Token : public nsIPK11Token,
+                    public nsNSSShutDownObject
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIPK11TOKEN
+
+  nsPK11Token(PK11SlotInfo *slot);
+  virtual ~nsPK11Token();
+  /* additional members */
+
+private:
+  friend class nsPK11TokenDB;
+  void refreshTokenInfo();
+
+  nsString mTokenName;
+  nsString mTokenLabel, mTokenManID, mTokenHWVersion, mTokenFWVersion;
+  nsString mTokenSerialNum;
+  PK11SlotInfo *mSlot;
+  int mSeries;
+  nsCOMPtr<nsIInterfaceRequestor> mUIContext;
+  virtual void virtualDestroyNSSReference();
+  void destructorSafeDestroyNSSReference();
+};
+
+class nsPK11TokenDB : public nsIPK11TokenDB
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIPK11TOKENDB
+
+  nsPK11TokenDB();
+  virtual ~nsPK11TokenDB();
+  /* additional members */
+};
+
+#define NS_PK11TOKENDB_CID \
+{ 0xb084a2ce, 0x1dd1, 0x11b2, \
+  { 0xbf, 0x10, 0x83, 0x24, 0xf8, 0xe0, 0x65, 0xcc }}
+
+#endif