diff -r 000000000000 -r 6474c204b198 security/manager/pki/src/nsPKIParamBlock.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/pki/src/nsPKIParamBlock.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,99 @@
+/* -*- 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/. */
+
+#include "nsPKIParamBlock.h"
+#include "nsIServiceManager.h"
+#include "nsIDialogParamBlock.h"
+#include "nsIMutableArray.h"
+
+NS_IMPL_ISUPPORTS(nsPKIParamBlock, nsIPKIParamBlock, nsIDialogParamBlock)
+
+nsPKIParamBlock::nsPKIParamBlock()
+{
+}
+
+nsresult
+nsPKIParamBlock::Init()
+{
+  mDialogParamBlock = do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
+  return !mDialogParamBlock ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
+}
+
+nsPKIParamBlock::~nsPKIParamBlock()
+{
+}
+
+
+NS_IMETHODIMP 
+nsPKIParamBlock::SetNumberStrings( int32_t inNumStrings )
+{
+  return mDialogParamBlock->SetNumberStrings(inNumStrings);
+}
+
+NS_IMETHODIMP 
+nsPKIParamBlock::SetInt(int32_t inIndex, int32_t inInt)
+{
+  return mDialogParamBlock->SetInt(inIndex, inInt);
+}
+
+NS_IMETHODIMP 
+nsPKIParamBlock::GetInt(int32_t inIndex, int32_t *outInt)
+{
+  return mDialogParamBlock->GetInt(inIndex, outInt);
+}
+
+
+NS_IMETHODIMP 
+nsPKIParamBlock::GetString(int32_t inIndex, char16_t **_retval)
+{
+  return mDialogParamBlock->GetString(inIndex, _retval);
+}
+
+NS_IMETHODIMP 
+nsPKIParamBlock::SetString(int32_t inIndex, const char16_t *inString)
+{
+  return mDialogParamBlock->SetString(inIndex, inString);
+}
+
+NS_IMETHODIMP
+nsPKIParamBlock::GetObjects(nsIMutableArray * *aObjects)
+{
+  return mDialogParamBlock->GetObjects(aObjects);
+}
+
+NS_IMETHODIMP
+nsPKIParamBlock::SetObjects(nsIMutableArray * aObjects)
+{
+  return mDialogParamBlock->SetObjects(aObjects);
+}
+
+
+
+/* void setISupportAtIndex (in int32_t index, in nsISupports object); */
+NS_IMETHODIMP 
+nsPKIParamBlock::SetISupportAtIndex(int32_t index, nsISupports *object)
+{
+  if (!mSupports) {
+    mSupports = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
+    if (!mSupports) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+  // Ignore any InsertElementAt error, because this function always did that
+  mSupports->InsertElementAt(object, index-1);
+  return NS_OK;
+}
+
+/* nsISupports getISupportAtIndex (in int32_t index); */
+NS_IMETHODIMP 
+nsPKIParamBlock::GetISupportAtIndex(int32_t index, nsISupports **_retval)
+{
+  NS_ENSURE_ARG(_retval);
+
+  return mSupports->GetElementAt(index - 1, _retval);
+}
+
+