Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 236ba87c0a9f (bug 440046) and d3b7606d94a6:895a7efc978d (bug 683262) for b2g mochitest failures

Browse Source
This commit is contained in:
Phil Ringnalda 2013-02-15 23:33:45 -08:00
parent f19a26b30b
commit c71c586441
28 changed files with 190 additions and 736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/confvars.sh
View File

@ -23,7 +23,7 @@ MOZ_SERVICES_METRICS=1
MOZ_CAPTIVEDETECT=1
MOZ_WEBSMS_BACKEND=1
MOZ_DISABLE_CRYPTOLEGACY=1
MOZ_DISABLE_DOMCRYPTO=1
MOZ_APP_STATIC_INI=1
if test "$OS_TARGET" = "Android"; then

7
configure.in
View File

@ -4241,7 +4241,7 @@ MOZ_XUL=1
MOZ_ZIPWRITER=1
NS_PRINTING=1
MOZ_PDF_PRINTING=
MOZ_DISABLE_CRYPTOLEGACY=
MOZ_DISABLE_DOMCRYPTO=
NSS_DISABLE_DBM=
NECKO_WIFI=1
NECKO_COOKIES=1
@ -6340,10 +6340,9 @@ AC_SUBST(MOZ_DISABLE_PARENTAL_CONTROLS)
dnl ========================================================
dnl = Disable DOMCrypto
dnl ========================================================
if test -n "$MOZ_DISABLE_CRYPTOLEGACY"; then
AC_DEFINE(MOZ_DISABLE_CRYPTOLEGACY)
if test -n "$MOZ_DISABLE_DOMCRYPTO"; then
AC_DEFINE(MOZ_DISABLE_DOMCRYPTO)
fi
AC_SUBST(MOZ_DISABLE_CRYPTOLEGACY)
dnl ========================================================
dnl =

172
dom/base/Crypto.cpp
View File

@ -1,172 +0,0 @@
/* 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 "Crypto.h"
#include "nsIDOMClassInfo.h"
#include "DOMError.h"
#include "nsString.h"
#include "nsIRandomGenerator.h"
#include "jsapi.h"
#include "jsfriendapi.h"
using namespace js::ArrayBufferView;
namespace mozilla {
namespace dom {
NS_INTERFACE_MAP_BEGIN(Crypto)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_ENTRY(nsIDOMCrypto)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Crypto)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(Crypto)
NS_IMPL_RELEASE(Crypto)
Crypto::Crypto()
{
MOZ_COUNT_CTOR(Crypto);
}
Crypto::~Crypto()
{
MOZ_COUNT_DTOR(Crypto);
}
NS_IMETHODIMP
Crypto::GetRandomValues(const jsval& aData, JSContext *cx, jsval* _retval)
{
// Make sure this is a JavaScript object
if (!aData.isObject()) {
return NS_ERROR_DOM_NOT_OBJECT_ERR;
}
JSObject* view = &aData.toObject();
// Make sure this object is an ArrayBufferView
if (!JS_IsTypedArrayObject(view)) {
return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
}
// Throw if the wrong type of ArrayBufferView is passed in
// (Part of the Web Crypto API spec)
switch (JS_GetArrayBufferViewType(view)) {
case TYPE_INT8:
case TYPE_UINT8:
case TYPE_UINT8_CLAMPED:
case TYPE_INT16:
case TYPE_UINT16:
case TYPE_INT32:
case TYPE_UINT32:
break;
default:
return NS_ERROR_DOM_TYPE_MISMATCH_ERR;
}
uint32_t dataLen = JS_GetTypedArrayByteLength(view);
if (dataLen == 0) {
NS_WARNING("ArrayBufferView length is 0, cannot continue");
return NS_OK;
} else if (dataLen > 65536) {
return NS_ERROR_DOM_QUOTA_EXCEEDED_ERR;
}
nsCOMPtr<nsIRandomGenerator> randomGenerator;
nsresult rv;
randomGenerator =
do_GetService("@mozilla.org/security/random-generator;1", &rv);
if (NS_FAILED(rv)) {
NS_WARNING("unable to continue without random number generator");
return rv;
}
void *dataptr = JS_GetArrayBufferViewData(view);
NS_ENSURE_TRUE(dataptr, NS_ERROR_FAILURE);
unsigned char* data =
static_cast<unsigned char*>(dataptr);
uint8_t *buf;
rv = randomGenerator->GenerateRandomBytes(dataLen, &buf);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
memcpy(data, buf, dataLen);
NS_Free(buf);
*_retval = OBJECT_TO_JSVAL(view);
return NS_OK;
}
#ifndef MOZ_DISABLE_CRYPTOLEGACY
// Stub out the legacy nsIDOMCrypto methods. The actual
// implementations are in security/manager/ssl/src/nsCrypto.{cpp,h}
NS_IMETHODIMP
Crypto::GetVersion(nsAString & aVersion)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::GetEnableSmartCardEvents(bool *aEnableSmartCardEvents)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::SetEnableSmartCardEvents(bool aEnableSmartCardEvents)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::GenerateCRMFRequest(nsIDOMCRMFObject * *_retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::ImportUserCertificates(const nsAString & nickname,
const nsAString & cmmfResponse,
bool doForcedBackup, nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::PopChallengeResponse(const nsAString & challenge,
nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::Random(int32_t numBytes, nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::SignText(const nsAString & stringToSign, const nsAString & caOption,
nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::Logout()
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
Crypto::DisableRightClick()
{
return NS_ERROR_NOT_IMPLEMENTED;
}
#endif
} // namespace dom
} // namespace mozilla

33
dom/base/Crypto.h
View File

@ -1,33 +0,0 @@
/* 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 mozilla_dom_Crypto_h
#define mozilla_dom_Crypto_h
#ifdef MOZ_DISABLE_CRYPTOLEGACY
#include "nsIDOMCrypto.h"
#else
#include "nsIDOMCryptoLegacy.h"
#endif
#define NS_DOMCRYPTO_CLASSNAME "Crypto JavaScript Class"
#define NS_DOMCRYPTO_CID \
{0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
namespace mozilla {
namespace dom {
class Crypto : public nsIDOMCrypto
{
public:
Crypto();
virtual ~Crypto();
NS_DECL_ISUPPORTS
NS_DECL_NSIDOMCRYPTO
};
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_Crypto_h

2
dom/base/Makefile.in
View File

@ -79,7 +79,6 @@ EXPORTS = \
nsContentPermissionHelper.h \
nsStructuredCloneContainer.h \
nsWindowMemoryReporter.h \
Crypto.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla/dom
@ -118,7 +117,6 @@ CPPSRCS = \
nsDOMNavigationTiming.cpp \
nsPerformance.cpp \
nsWindowMemoryReporter.cpp \
Crypto.cpp \
DOMError.cpp \
DOMRequest.cpp \
DOMCursor.cpp \

39
dom/base/nsDOMClassInfo.cpp
View File

@ -286,12 +286,8 @@
#include "nsIDOMXULDocument.h"
#include "nsIDOMXULElement.h"
#include "nsIDOMXULCommandDispatcher.h"
#ifndef MOZ_DISABLE_CRYPTOLEGACY
#include "nsIDOMCRMFObject.h"
#include "nsIDOMCryptoLegacy.h"
#else
#include "nsIDOMCrypto.h"
#endif
#include "nsIDOMCRMFObject.h"
#include "nsIControllers.h"
#include "nsISelection.h"
#include "nsIBoxObject.h"
@ -481,6 +477,12 @@ static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
static const char kDOMStringBundleURL[] =
"chrome://global/locale/dom/dom.properties";
#ifdef MOZ_DISABLE_DOMCRYPTO
static const bool domCryptoEnabled = false;
#else
static const bool domCryptoEnabled = true;
#endif
// NOTE: DEFAULT_SCRIPTABLE_FLAGS and DOM_DEFAULT_SCRIPTABLE_FLAGS
// are defined in nsIDOMClassInfo.h.
@ -554,11 +556,8 @@ static const char kDOMStringBundleURL[] =
const uint32_t kDOMClassInfo_##_dom_class##_interfaces = \
0;
#ifndef MOZ_DISABLE_CRYPTOLEGACY
DOMCI_DATA_NO_CLASS(CRMFObject)
#endif
DOMCI_DATA_NO_CLASS(Crypto)
DOMCI_DATA_NO_CLASS(CRMFObject)
DOMCI_DATA_NO_CLASS(ContentFrameMessageManager)
DOMCI_DATA_NO_CLASS(ChromeMessageBroadcaster)
DOMCI_DATA_NO_CLASS(ChromeMessageSender)
@ -957,12 +956,10 @@ static nsDOMClassInfoData sClassInfoData[] = {
#endif
// Crypto classes
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NS_DEFINE_CLASSINFO_DATA(CRMFObject, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
#endif
NS_DEFINE_CLASSINFO_DATA(Crypto, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(CRMFObject, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
// DOM Traversal classes
NS_DEFINE_CLASSINFO_DATA(TreeWalker, nsDOMGenericSH,
@ -2061,7 +2058,8 @@ nsDOMClassInfo::RegisterExternalClasses()
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMWindowPerformance, \
nsGlobalWindow::HasPerformanceSupport()) \
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsITouchEventReceiver, \
nsDOMTouchEvent::PrefEnabled())
nsDOMTouchEvent::PrefEnabled()) \
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIWindowCrypto, domCryptoEnabled)
#else // !MOZ_B2G
#define DOM_CLASSINFO_WINDOW_MAP_ENTRIES(_support_indexed_db) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow) \
@ -2073,7 +2071,8 @@ nsDOMClassInfo::RegisterExternalClasses()
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMWindowPerformance, \
nsGlobalWindow::HasPerformanceSupport()) \
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsITouchEventReceiver, \
nsDOMTouchEvent::PrefEnabled())
nsDOMTouchEvent::PrefEnabled()) \
DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIWindowCrypto, domCryptoEnabled)
#endif // MOZ_B2G
nsresult
@ -2765,16 +2764,14 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_END
#endif
#ifndef MOZ_DISABLE_CRYPTOLEGACY
DOM_CLASSINFO_MAP_BEGIN(CRMFObject, nsIDOMCRMFObject)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCRMFObject)
DOM_CLASSINFO_MAP_END
#endif
DOM_CLASSINFO_MAP_BEGIN(Crypto, nsIDOMCrypto)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCrypto)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(CRMFObject, nsIDOMCRMFObject)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMCRMFObject)
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(XMLStylesheetProcessingInstruction, nsIDOMProcessingInstruction)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMProcessingInstruction)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMLinkStyle)

5
dom/base/nsDOMClassInfo.h
View File

@ -29,11 +29,6 @@ class nsIForm;
class nsIHTMLDocument;
class nsNPAPIPluginInstance;
class nsIDOMCrypto;
#ifndef MOZ_DISABLE_CRYPTOLEGACY
class nsIDOMCRMFObject;
#endif
struct nsDOMClassInfoData;
typedef nsIClassInfo* (*nsDOMClassInfoConstructorFnc)

4
dom/base/nsDOMClassInfoClasses.h
View File

@ -149,10 +149,8 @@ DOMCI_CLASS(TreeContentView)
#endif
// Crypto classes
#ifndef MOZ_DISABLE_CRYPTOLEGACY
DOMCI_CLASS(CRMFObject)
#endif
DOMCI_CLASS(Crypto)
DOMCI_CLASS(CRMFObject)
// DOM Traversal classes
DOMCI_CLASS(TreeWalker)

28
dom/base/nsGlobalWindow.cpp
View File

@ -85,7 +85,9 @@
#include "nsIHTMLDocument.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLElement.h"
#include "Crypto.h"
#ifndef MOZ_DISABLE_DOMCRYPTO
#include "nsIDOMCrypto.h"
#endif
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
#include "nsIDOMEvent.h"
@ -418,6 +420,10 @@ nsGlobalWindow::DOMMinTimeoutValue() const {
static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID);
static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
#ifndef MOZ_DISABLE_DOMCRYPTO
static const char kCryptoContractID[] = NS_CRYPTO_CONTRACTID;
static const char kPkcs11ContractID[] = NS_PKCS11_CONTRACTID;
#endif
static const char sPopStatePrefStr[] = "browser.history.allowPopState";
#define NETWORK_UPLOAD_EVENT_NAME NS_LITERAL_STRING("moznetworkupload")
@ -1453,6 +1459,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow)
NS_INTERFACE_MAP_ENTRY(nsIDOMWindowPerformance)
NS_INTERFACE_MAP_ENTRY(nsITouchEventReceiver)
NS_INTERFACE_MAP_ENTRY(nsIInlineEventHandlers)
NS_INTERFACE_MAP_ENTRY(nsIWindowCrypto)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Window)
OUTER_WINDOW_ONLY
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
@ -2017,15 +2024,12 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
NS_ENSURE_TRUE(scx, NS_ERROR_NOT_INITIALIZED);
JSContext *cx = scx->GetNativeContext();
#ifndef MOZ_DISABLE_CRYPTOLEGACY
#ifndef MOZ_DISABLE_DOMCRYPTO
// clear smartcard events, our document has gone away.
if (mCrypto) {
nsresult rv = mCrypto->SetEnableSmartCardEvents(false);
NS_ENSURE_SUCCESS(rv, rv);
mCrypto->SetEnableSmartCardEvents(false);
}
#endif
if (!mDocument) {
// First document load.
@ -3575,17 +3579,19 @@ nsGlobalWindow::GetApplicationCache(nsIDOMOfflineResourceList **aApplicationCach
NS_IMETHODIMP
nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto)
{
#ifdef MOZ_DISABLE_DOMCRYPTO
return NS_ERROR_NOT_IMPLEMENTED;
#else
FORWARD_TO_OUTER(GetCrypto, (aCrypto), NS_ERROR_NOT_INITIALIZED);
if (!mCrypto) {
#ifndef MOZ_DISABLE_CRYPTOLEGACY
mCrypto = do_CreateInstance(NS_CRYPTO_CONTRACTID);
#else
mCrypto = new Crypto();
#endif
mCrypto = do_CreateInstance(kCryptoContractID);
}
NS_IF_ADDREF(*aCrypto = mCrypto);
return NS_OK;
#endif
}
NS_IMETHODIMP

17
dom/base/nsGlobalWindow.h
View File

@ -41,6 +41,9 @@
#include "nsIScriptSecurityManager.h"
#include "nsEventListenerManager.h"
#include "nsIDOMDocument.h"
#ifndef MOZ_DISABLE_DOMCRYPTO
#include "nsIDOMCrypto.h"
#endif
#include "nsIPrincipal.h"
#include "nsIXPCScriptable.h"
#include "nsPoint.h"
@ -93,7 +96,6 @@
class nsIDOMBarProp;
class nsIDocument;
class nsPresContext;
class nsIDOMCrypto;
class nsIDOMEvent;
class nsIScrollableFrame;
class nsIControllers;
@ -113,6 +115,10 @@ class nsDOMOfflineResourceList;
class nsDOMWindowUtils;
class nsIIdleService;
#ifdef MOZ_DISABLE_DOMCRYPTO
class nsIDOMCrypto;
#endif
class nsWindowSizes;
namespace mozilla {
@ -260,7 +266,8 @@ class nsGlobalWindow : public mozilla::dom::EventTarget,
public PRCListStr,
public nsIDOMWindowPerformance,
public nsITouchEventReceiver,
public nsIInlineEventHandlers
public nsIInlineEventHandlers,
public nsIWindowCrypto
#ifdef MOZ_B2G
, public nsIDOMWindowB2G
#endif // MOZ_B2G
@ -331,6 +338,9 @@ public:
// nsIInlineEventHandlers
NS_DECL_NSIINLINEEVENTHANDLERS
// nsIWindowCrypto
NS_DECL_NSIWINDOWCRYPTO
// nsPIDOMWindow
virtual NS_HIDDEN_(nsPIDOMWindow*) GetPrivateRoot();
virtual NS_HIDDEN_(void) ActivateOrDeactivate(bool aActivate);
@ -1070,8 +1080,9 @@ protected:
nsString mDefaultStatus;
// index 0->language_id 1, so index MAX-1 == language_id MAX
nsGlobalWindowObserver* mObserver;
#ifndef MOZ_DISABLE_DOMCRYPTO
nsCOMPtr<nsIDOMCrypto> mCrypto;
#endif
nsCOMPtr<nsIDOMStorage> mLocalStorage;
nsCOMPtr<nsIDOMStorage> mSessionStorage;

15
dom/interfaces/base/Makefile.in
View File

@ -32,6 +32,7 @@ XPIDLSRCS = \
nsIDOMClientInformation.idl \
nsIDOMConstructor.idl \
nsIDOMCRMFObject.idl \
nsIDOMCrypto.idl \
nsIDOMHistory.idl \
nsIDOMLocation.idl \
nsIDOMMediaQueryList.idl \
@ -57,20 +58,10 @@ XPIDLSRCS = \
nsIIdleObserver.idl \
$(NULL)
ifdef MOZ_DISABLE_CRYPTOLEGACY
XPIDLSRCS += \
nsIDOMCrypto.idl \
$(NULL)
else
XPIDLSRCS += \
nsIDOMCryptoLegacy.idl \
$(NULL)
endif
ifdef MOZ_B2G
XPIDLSRCS += \
nsIDOMWindowB2G.idl \
$(NULL)
nsIDOMWindowB2G.idl \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

20
dom/interfaces/base/nsIDOMCrypto.idl
View File

@ -3,10 +3,22 @@
* 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 "nsISupports.idl"
[scriptable, uuid(a0a3bc68-eab3-4e66-b5cb-b1d86765119c)]
#include "domstubs.idl"
[scriptable, uuid(12b6d899-2aed-4ea9-8c02-2223ab7ab592)]
interface nsIDOMCrypto : nsISupports
{
[implicit_jscontext] jsval getRandomValues(in jsval aData);
readonly attribute DOMString version;
attribute boolean enableSmartCardEvents;
nsIDOMCRMFObject generateCRMFRequest(/* ... */);
DOMString importUserCertificates(in DOMString nickname,
in DOMString cmmfResponse,
in boolean doForcedBackup);
DOMString popChallengeResponse(in DOMString challenge);
DOMString random(in long numBytes);
DOMString signText(in DOMString stringToSign,
in DOMString caOption /* ... */);
void logout();
void disableRightClick();
};

28
dom/interfaces/base/nsIDOMCryptoLegacy.idl
View File

@ -1,28 +0,0 @@
/* -*- Mode: IDL; 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 "domstubs.idl"
interface nsIDOMCRMFObject;
[scriptable, uuid(e1df1d4d-41ef-4225-934a-107c5d612686)]
interface nsIDOMCrypto : nsISupports
{
readonly attribute DOMString version;
attribute boolean enableSmartCardEvents;
nsIDOMCRMFObject generateCRMFRequest(/* ... */);
DOMString importUserCertificates(in DOMString nickname,
in DOMString cmmfResponse,
in boolean doForcedBackup);
DOMString popChallengeResponse(in DOMString challenge);
DOMString random(in long numBytes);
DOMString signText(in DOMString stringToSign,
in DOMString caOption /* ... */);
void logout();
void disableRightClick();
[implicit_jscontext] jsval getRandomValues(in jsval aData);
};

16
dom/interfaces/base/nsIDOMWindow.idl
View File

@ -25,7 +25,7 @@ interface nsIVariant;
* @see <http://www.whatwg.org/html/#window>
*/
[scriptable, uuid(39cb59d4-fba9-48a9-b70b-570a7ec2ebfa)]
[scriptable, uuid(8d86d6b2-fc2c-416a-8085-f670d5a35832)]
interface nsIDOMWindow : nsISupports
{
// the current browsing context
@ -360,9 +360,6 @@ interface nsIDOMWindow : nsISupports
readonly attribute boolean closed;
readonly attribute nsIDOMCrypto crypto;
readonly attribute nsIDOMPkcs11 pkcs11;
// XXX Shouldn't this be in nsIDOMChromeWindow?
/* [replaceable] controllers */
readonly attribute nsIControllers controllers;
@ -502,6 +499,17 @@ interface nsIDOMWindowPerformance : nsISupports
readonly attribute nsISupports performance;
};
[scriptable, uuid(2ed9ace1-172c-443f-b92f-c4f74bf8f2c5)]
interface nsIWindowCrypto : nsISupports
{
/**
* A namespace to hold crypto related data and statistics.
* http://wiki.whatwg.org/wiki/Crypto
*/
readonly attribute nsIDOMCrypto crypto;
readonly attribute nsIDOMPkcs11 pkcs11;
};
/**
* Empty interface for compatibility with older versions.
* @deprecated Use nsIDOMWindow instead

1
dom/tests/mochitest/Makefile.in
View File

@ -18,7 +18,6 @@ DIRS += \
ajax \
bugs \
chrome \
crypto \
general \
whatwg \
geolocation \

25
dom/tests/mochitest/crypto/Makefile.in
View File

@ -1,25 +0,0 @@
# 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/.
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = dom/tests/mochitest/crypto
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
test_getRandomValues.html \
$(NULL)
ifndef MOZ_DISABLE_CRYPTOLEGACY
_TEST_FILES += test_legacy.html
else
_TEST_FILES += test_no_legacy.html
endif
libs:: $(_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)

204
dom/tests/mochitest/crypto/test_getRandomValues.html
View File

@ -1,204 +0,0 @@
<!DOCTYPE HTML>
<html><head>
<title>Test window.crypto.getRandomValues</title>
<script type="text/javascript" src="/MochiKit/packed.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="onWindowLoad()">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
var testData = [ { len: 32, type: "Int8", pass: true },
{ len: 32, type: "Int16", pass: true },
{ len: 32, type: "Int32", pass: true },
{ len: 32, type: "Uint8", pass: true },
{ len: 32, type: "Uint16", pass: true },
{ len: 32, type: "Uint32", pass: true },
{ len: 65536, type: "Uint8", pass: true },
{ len: 32, type: "Uint8Clamped", pass: true },
{ len: 65537, type: "Uint8", pass: false },
{ len: 32, type: "Float32", pass: false },
{ len: 32, type: "Float64", pass: false } ];
var testCount = 0;
function testNsCryptoGetRandomValues(aLength, aType)
{
var arrayTypes = {
Int8: Int8Array,
Int16: Int16Array,
Int32: Int32Array,
Uint8: Uint8Array,
Uint16: Uint16Array,
Uint32: Uint32Array,
Float32: Float32Array,
Float64: Float64Array,
Uint8Clamped: Uint8ClampedArray,
};
testCount++;
var buf = new ArrayBuffer(aLength);
var arBuf = new arrayTypes[aType](buf);
var pass = false;
var b = window.crypto.getRandomValues(arBuf);
ok(b === arBuf, "ArrayBuffer result is argument buffer");
for (var i = 0; i < arBuf.length; i++) {
if (arBuf.length > 6) {
// XXXddahl: THIS MIGHT FAIL EVERY FULL MOON, SORRY QA!!!
if (arBuf[i] != 0) {
pass = true;
break;
}
}
else {
pass = true;
}
}
is(pass, true, "Non-zero result: " + i + " found in the " + aType + ": " + aLength + " ArrayBufferView");
}
function onWindowLoad()
{
window.removeEventListener("load", onWindowLoad, false);
var failedWithCorrectError = false;
try {
for (var i = 0; i < testData.length; i++) {
if (testData[i].pass) {
try {
testNsCryptoGetRandomValues(testData[i].len, testData[i].type, testData[i].pass);
}
catch (ex) {
ok(false, "testNsCryptoGetRandomValues failed, test should have passed: " + testData[i].type);
}
}
else {
// failing tests are dealt with here
if (i == 8) {
try {
testNsCryptoGetRandomValues(testData[i].len, testData[i].type, testData[i].pass);
}
catch (ex) {
todo("QuotaExceededError" in window && ex instanceof QuotaExceededError,
"Exception was the correct type");
failedWithCorrectError = ex.toString().search(/QUOTA_EXCEEDED_ERR/);
ok(failedWithCorrectError, "Extended length array buffer fails, NS_ERROR_DOM_QUOTA_EXCEEDED_ERR thrown");
}
} // 8
if (i == 9) {
try {
testNsCryptoGetRandomValues(testData[i].len, testData[i].type, testData[i].pass);
}
catch (ex) {
failedWithCorrectError = ex.toString().search(/TYPE_MISMATCH_ERR/);
ok(failedWithCorrectError,
"Expected TYPE_MISMATCH_ERR: Float32Array is not valid, got " + ex + ".");
}
} // 9
if (i == 10) {
try {
testNsCryptoGetRandomValues(testData[i].len, testData[i].type, testData[i].pass);
}
catch (ex) {
failedWithCorrectError = ex.toString().search(/TYPE_MISMATCH_ERR/);
ok(failedWithCorrectError,
"Expected TYPE_MISMATCH_ERR: Float64Array is not valid, got " + ex + ".");
}
}
}
} // end main for loop
}
catch (ex) {
ok(false, "Unexpected Error: " + ex);
}
// Count the tests in the testData array
ok(testCount == 11, "11 tests run via testData");
// Test a null argument
try {
window.crypto.getRandomValues(null);
}
catch (ex) {
var test = ex.toString().search(/1003/);
ok((test > -1), "Expected TYPE_ERR, got " + ex + ".");
}
// Test a zero-length buffer view
try {
var a = new Int8Array(0);
window.crypto.getRandomValues(a);
ok(a[0] === undefined, "The array buffer is unchanged, still 0 length");
}
catch (ex) {
ok(false, "A zero-length array buffer view should not fail");
}
// Test a one-length buffer view
try {
var a = new Int8Array(1);
var b = window.crypto.getRandomValues(a);
ok(a[0] !== 0, "The array buffer has one random value");
ok(a === b, "ArrayBuffer result is argument buffer");
}
catch (ex) {
ok(false, "A one-length array buffer view should not fail");
}
// Test a 16 byte length buffer
var testConfig = { len: 16, type: "Int8", pass: true };
testNsCryptoGetRandomValues(testConfig.len,
testConfig.type,
testConfig.pass);
// Test a 31 byte length buffer
testConfig = { len: 31, type: "Int8", pass: true };
testNsCryptoGetRandomValues(testConfig.len,
testConfig.type,
testConfig.pass);
// Test a 33 byte length buffer
testConfig = { len: 33, type: "Int8", pass: true };
testNsCryptoGetRandomValues(testConfig.len,
testConfig.type,
testConfig.pass);
// Test a range of an array buffer view
var buffer = new ArrayBuffer(32);
var view = new Int8Array(buffer, 0, 16);
var view2 = new Int8Array(buffer, 16, 16);
for (var i = 0; i < view2.byteLength; i++) {
view2[i] = 1;
}
var b = window.crypto.getRandomValues(view);
ok(b === view, "ArrayBuffer result is argument buffer");
for (var i = 0; i < view.byteLength; i++) {
is(view2[i], 1, "view2 is unchanged");
}
// test an offset view
var result = false;
var b = window.crypto.getRandomValues(view2);
for (var i = 0; i < view2.length; i++) {
if (view2[i] != 1) {
result = true;
break;
}
}
ok(result, "view2 has been updated correctly");
ok(b === view2, "ArrayBuffer result is argument buffer");
// test the return value
buffer = new ArrayBuffer(32);
view = new Int8Array(buffer, 0, 16);
var retval = window.crypto.getRandomValues(view);
ok(view === retval, "The view and return value are the same");
SimpleTest.finish();
}
</script>
</body></html>

28
dom/tests/mochitest/crypto/test_legacy.html
View File

@ -1,28 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test presence of legacy window.crypto features when
MOZ_DISABLE_CRYPTOLEGACY is NOT set.</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script class="testbody" type="text/javascript">
ok("crypto" in window, "crypto in window");
ok("version" in window.crypto, "version in window.crypto");
ok("enableSmartCardEvents" in window.crypto,
"enableSmartCardEvents in window.crypto");
ok("generateCRMFRequest" in window.crypto,
"generateCRMFRequest in window.crypto");
ok("importUserCertificates" in window.crypto,
"importUserCertificates in window.crypto");
ok("popChallengeResponse" in window.crypto,
"popChallengeResponse in window.crypto");
ok("random" in window.crypto, "random in window.crypto");
ok("signText" in window.crypto, "signText in window.crypto");
ok("disableRightClick" in window.crypto,
"disableRightClick in window.crypto");
</script>
</body></html>

28
dom/tests/mochitest/crypto/test_no_legacy.html
View File

@ -1,28 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test lack of legacy window.crypto features when
MOZ_DISABLE_CRYPTOLEGACY is set</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<script class="testbody" type="text/javascript">
ok("crypto" in window, "crypto in window");
ok(!("version" in window.crypto), "version not in window.crypto");
ok(!("enableSmartCardEvents" in window.crypto),
"enableSmartCardEvents not in window.crypto");
ok(!("generateCRMFRequest" in window.crypto),
"generateCRMFRequest not in window.crypto");
ok(!("importUserCertificates" in window.crypto),
"importUserCertificates not in window.crypto");
ok(!("popChallengeResponse" in window.crypto),
"popChallengeResponse not in window.crypto");
ok(!("random" in window.crypto), "random not in window.crypto");
ok(!("signText" in window.crypto), "signText not in window.crypto");
ok(!("disableRightClick" in window.crypto),
"disableRightClick not in window.crypto");
</script>
</body></html>

2
mobile/android/confvars.sh
View File

@ -14,7 +14,7 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
MOZ_SAFE_BROWSING=1
MOZ_DISABLE_CRYPTOLEGACY=1
MOZ_DISABLE_DOMCRYPTO=1
# Enable getUserMedia
MOZ_MEDIA_NAVIGATOR=1

2
mobile/xul/confvars.sh
View File

@ -18,6 +18,8 @@ MOZ_SERVICES_CRYPTO=1
MOZ_SERVICES_METRICS=1
MOZ_SERVICES_SYNC=1
MOZ_DISABLE_DOMCRYPTO=1
if test "$LIBXUL_SDK"; then
MOZ_XULRUNNER=1
else

8
security/manager/ssl/src/Makefile.in
View File

@ -62,6 +62,7 @@ CPPSRCS = \
nsCRLManager.cpp \
nsNSSShutDown.cpp \
nsNTLMAuthModule.cpp \
nsSmartCardMonitor.cpp \
nsStreamCipher.cpp \
nsKeyModule.cpp \
nsIdentityChecking.cpp \
@ -75,12 +76,6 @@ CPPSRCS = \
SharedSSLState.cpp \
$(NULL)
ifndef MOZ_DISABLE_CRYPTOLEGACY
CPPSRCS += \
nsSmartCardMonitor.cpp \
$(NULL)
endif
ifdef MOZ_XUL
CPPSRCS += nsCertTree.cpp
endif
@ -99,7 +94,6 @@ EXPORTS += \
CryptoTask.h \
nsNSSShutDown.h \
ScopedNSSTypes.h \
nsRandomGenerator.h \
$(NULL)
EXPORTS_NAMESPACES = mozilla

86
security/manager/ssl/src/nsCrypto.cpp
View File

@ -3,18 +3,8 @@
* 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 "nsNSSComponent.h"
#include "nsCrypto.h"
#include "nsNSSComponent.h"
#include "secmod.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
#include "nsXPIDLString.h"
#include "nsISaveAsCharset.h"
#include "nsNativeCharsetUtils.h"
#ifndef MOZ_DISABLE_CRYPTOLEGACY
#include "nsNSSComponent.h"
#include "nsKeygenHandler.h"
#include "nsKeygenThread.h"
#include "nsNSSCertificate.h"
@ -25,6 +15,7 @@
#include "nsIServiceManager.h"
#include "nsIMemory.h"
#include "nsAlgorithm.h"
#include "nsCRT.h"
#include "prprf.h"
#include "nsDOMCID.h"
#include "nsIDOMWindow.h"
@ -43,6 +34,7 @@
#include "nsJSPrincipals.h"
#include "nsIPrincipal.h"
#include "nsIScriptSecurityManager.h"
#include "nsXPIDLString.h"
#include "nsIGenKeypairInfoDlg.h"
#include "nsIDOMCryptoDialogs.h"
#include "nsIFormSigningDialog.h"
@ -50,6 +42,7 @@
#include "jsapi.h"
#include "jsdbgapi.h"
#include <ctype.h>
#include "nsReadableUtils.h"
#include "pk11func.h"
#include "keyhi.h"
#include "cryptohi.h"
@ -64,18 +57,22 @@
#include "cert.h"
#include "certdb.h"
#include "secmod.h"
#include "nsISaveAsCharset.h"
#include "nsNativeCharsetUtils.h"
#include "ScopedNSSTypes.h"
#include "ssl.h" // For SSL_ClearSessionCache
#include "nsNSSCleaner.h"
#include "nsNSSShutDown.h"
#include "nsNSSCertHelper.h"
#include <algorithm>
#endif
using namespace mozilla;
NSSCleanupAutoPtrClass_WithParam(PK11Context, PK11_DestroyContext, TrueParam, true)
/*
* These are the most common error strings that are returned
* by the JavaScript methods in case of error.
@ -101,16 +98,6 @@ using namespace mozilla;
#define JS_ERR_BAD_CIPHER_ENABLE_FLAGS -9
#define JS_ERR_ADD_DUPLICATE_MOD -10
namespace {
NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
} // unnamed namespace
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NSSCleanupAutoPtrClass_WithParam(PK11Context, PK11_DestroyContext, TrueParam, true)
/*
* This structure is used to store information for one key generation.
* The nsCrypto::GenerateCRMFRequest method parses the inputs and then
@ -208,11 +195,13 @@ private:
// QueryInterface implementation for nsCrypto
NS_INTERFACE_MAP_BEGIN(nsCrypto)
NS_INTERFACE_MAP_ENTRY(nsIDOMCrypto)
NS_INTERFACE_MAP_END_INHERITING(mozilla::dom::Crypto)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Crypto)
NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(nsCrypto)
NS_IMPL_RELEASE(nsCrypto)
NS_IMPL_ADDREF_INHERITED(nsCrypto, mozilla::dom::Crypto)
NS_IMPL_RELEASE_INHERITED(nsCrypto, mozilla::dom::Crypto)
// QueryInterface implementation for nsCRMFObject
NS_INTERFACE_MAP_BEGIN(nsCRMFObject)
NS_INTERFACE_MAP_ENTRY(nsIDOMCRMFObject)
@ -224,8 +213,6 @@ NS_IMPL_ADDREF(nsCRMFObject)
NS_IMPL_RELEASE(nsCRMFObject)
// QueryInterface implementation for nsPkcs11
#endif // MOZ_DISABLE_CRYPTOLEGACY
NS_INTERFACE_MAP_BEGIN(nsPkcs11)
NS_INTERFACE_MAP_ENTRY(nsIPKCS11)
NS_INTERFACE_MAP_ENTRY(nsISupports)
@ -234,8 +221,6 @@ NS_INTERFACE_MAP_END
NS_IMPL_ADDREF(nsPkcs11)
NS_IMPL_RELEASE(nsPkcs11)
#ifndef MOZ_DISABLE_CRYPTOLEGACY
// ISupports implementation for nsCryptoRunnable
NS_IMPL_ISUPPORTS1(nsCryptoRunnable, nsIRunnable)
@ -245,6 +230,8 @@ NS_IMPL_ISUPPORTS1(nsP12Runnable, nsIRunnable)
// ISupports implementation for nsCryptoRunArgs
NS_IMPL_ISUPPORTS0(nsCryptoRunArgs)
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
nsCrypto::nsCrypto() :
mEnableSmartCardEvents(false)
{
@ -2856,12 +2843,6 @@ nsCrypto::DisableRightClick()
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsCrypto::GetRandomValues(const jsval& aData, JSContext *cx, jsval* _retval)
{
return mozilla::dom::Crypto::GetRandomValues(aData, cx, _retval);
}
nsCRMFObject::nsCRMFObject()
{
}
@ -2890,8 +2871,6 @@ nsCRMFObject::SetCRMFRequest(char *inRequest)
return NS_OK;
}
#endif // MOZ_DISABLE_CRYPTOLEGACY
nsPkcs11::nsPkcs11()
{
}
@ -2900,6 +2879,33 @@ nsPkcs11::~nsPkcs11()
{
}
//Quick function to confirm with the user.
bool
confirm_user(const PRUnichar *message)
{
int32_t buttonPressed = 1; // If the user exits by clicking the close box, assume No (button 1)
nsCOMPtr<nsIPrompt> prompter;
(void) nsNSSComponent::GetNewPrompter(getter_AddRefs(prompter));
if (prompter) {
nsPSMUITracker tracker;
if (!tracker.isUIForbidden()) {
// The actual value is irrelevant but we shouldn't be handing out
// malformed JSBools to XPConnect.
bool checkState = false;
prompter->ConfirmEx(0, message,
(nsIPrompt::BUTTON_DELAY_ENABLE) +
(nsIPrompt::BUTTON_POS_1_DEFAULT) +
(nsIPrompt::BUTTON_TITLE_OK * nsIPrompt::BUTTON_POS_0) +
(nsIPrompt::BUTTON_TITLE_CANCEL * nsIPrompt::BUTTON_POS_1),
nullptr, nullptr, nullptr, nullptr, &checkState, &buttonPressed);
}
}
return (buttonPressed == 0);
}
//Delete a PKCS11 module from the user's profile.
NS_IMETHODIMP
nsPkcs11::DeleteModule(const nsAString& aModuleName)
@ -2922,9 +2928,7 @@ nsPkcs11::DeleteModule(const nsAString& aModuleName)
if (srv == SECSuccess) {
SECMODModule *module = SECMOD_FindModule(modName.get());
if (module) {
#ifndef MOZ_DISABLE_CRYPTOLEGACY
nssComponent->ShutdownSmartCardThread(module);
#endif
SECMOD_DestroyModule(module);
}
rv = NS_OK;
@ -2956,9 +2960,7 @@ nsPkcs11::AddModule(const nsAString& aModuleName,
if (srv == SECSuccess) {
SECMODModule *module = SECMOD_FindModule(moduleName.get());
if (module) {
#ifndef MOZ_DISABLE_CRYPTOLEGACY
nssComponent->LaunchSmartCardThread(module);
#endif
SECMOD_DestroyModule(module);
}
}

28
security/manager/ssl/src/nsCrypto.h
View File

@ -5,12 +5,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef _nsCrypto_h_
#define _nsCrypto_h_
#ifndef MOZ_DISABLE_CRYPTOLEGACY
#include "Crypto.h"
#include "nsCOMPtr.h"
#include "nsIDOMCRMFObject.h"
#include "nsIDOMCryptoLegacy.h"
#include "nsIDOMCrypto.h"
#include "nsIPKCS11.h"
#include "nsIRunnable.h"
#include "nsString.h"
#include "jsapi.h"
@ -19,6 +17,11 @@
#define NS_CRYPTO_CLASSNAME "Crypto JavaScript Class"
#define NS_CRYPTO_CID \
{0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
#define NS_PKCS11_CLASSNAME "Pkcs11 JavaScript Class"
#define NS_PKCS11_CID \
{0x74b7a390, 0x3b41, 0x11d4, { 0x8a, 0x80, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
#define PSM_VERSION_STRING "2.4"
class nsIPSMComponent;
@ -43,16 +46,14 @@ private:
};
class nsCrypto: public mozilla::dom::Crypto
class nsCrypto: public nsIDOMCrypto
{
public:
nsCrypto();
virtual ~nsCrypto();
NS_DECL_ISUPPORTS_INHERITED
// If legacy DOM crypto is enabled this is the class that actually
// implements the legacy methods.
nsresult init();
NS_DECL_ISUPPORTS
NS_DECL_NSIDOMCRYPTO
private:
@ -60,13 +61,6 @@ private:
bool mEnableSmartCardEvents;
};
#endif // MOZ_DISABLE_CRYPTOLEGACY
#include "nsIPKCS11.h"
#define NS_PKCS11_CLASSNAME "Pkcs11 JavaScript Class"
#define NS_PKCS11_CID \
{0x74b7a390, 0x3b41, 0x11d4, { 0x8a, 0x80, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
class nsPkcs11 : public nsIPKCS11
{

92
security/manager/ssl/src/nsNSSComponent.cpp
View File

@ -19,33 +19,26 @@
#include "nsIStreamListener.h"
#include "nsIStringBundle.h"
#include "nsIDirectoryService.h"
#include "nsIDOMNode.h"
#include "nsCURILoader.h"
#include "nsDirectoryServiceDefs.h"
#include "nsIX509Cert.h"
#include "nsIX509CertDB.h"
#include "nsNSSCertificate.h"
#include "nsNSSHelper.h"
#include "nsSmartCardMonitor.h"
#include "prlog.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIDateTimeFormat.h"
#include "nsDateTimeFormatCID.h"
#include "nsThreadUtils.h"
#ifndef MOZ_DISABLE_CRYPTOLEGACY
#include "nsIDOMNode.h"
#include "nsIDOMEvent.h"
#include "nsIDOMDocument.h"
#include "nsIDOMWindow.h"
#include "nsIDOMWindowCollection.h"
#include "nsIDOMSmartCardEvent.h"
#include "nsSmartCardMonitor.h"
#include "nsIDOMCryptoLegacy.h"
#include "nsIPrincipal.h"
#else
#include "nsIDOMCrypto.h"
#endif
#include "nsThreadUtils.h"
#include "nsCRT.h"
#include "nsCRLInfo.h"
#include "nsCertOverrideService.h"
@ -65,6 +58,7 @@
#include "nsICRLManager.h"
#include "nsNSSShutDown.h"
#include "GeneratedEvents.h"
#include "nsIDOMSmartCardEvent.h"
#include "nsIKeyModule.h"
#include "ScopedNSSTypes.h"
#include "SharedSSLState.h"
@ -211,7 +205,6 @@ private:
nsCOMPtr<nsIStreamListener> mListener;
};
#ifndef MOZ_DISABLE_CRYPTOLEGACY
//This class is used to run the callback code
//passed to the event handlers for smart card notification
class nsTokenEventRunnable : public nsIRunnable {
@ -246,7 +239,6 @@ nsTokenEventRunnable::Run()
return nssComponent->DispatchEvent(mType, mTokenName);
}
#endif // MOZ_DISABLE_CRYPTOLEGACY
bool nsPSMInitPanic::isPanic = false;
@ -334,9 +326,7 @@ nsNSSComponent::nsNSSComponent()
:mutex("nsNSSComponent.mutex"),
mNSSInitialized(false),
mCrlTimerLock("nsNSSComponent.mCrlTimerLock"),
#ifndef MOZ_DISABLE_CRYPTOLEGACY
mThreadList(nullptr),
#endif
mCertVerificationThread(nullptr)
{
#ifdef PR_LOGGING
@ -425,7 +415,6 @@ nsNSSComponent::~nsNSSComponent()
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent::dtor finished\n"));
}
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NS_IMETHODIMP
nsNSSComponent::PostEvent(const nsAString &eventType,
const nsAString &tokenName)
@ -478,47 +467,52 @@ nsNSSComponent::DispatchEvent(const nsAString &eventType,
nsresult
nsNSSComponent::DispatchEventToWindow(nsIDOMWindow *domWin,
const nsAString &eventType,
const nsAString &tokenName)
const nsAString &eventType, const nsAString &tokenName)
{
if (!domWin) {
return NS_OK;
}
// first walk the children and dispatch their events
nsresult rv;
nsCOMPtr<nsIDOMWindowCollection> frames;
rv = domWin->GetFrames(getter_AddRefs(frames));
if (NS_FAILED(rv)) {
return rv;
}
{
nsresult rv;
nsCOMPtr<nsIDOMWindowCollection> frames;
rv = domWin->GetFrames(getter_AddRefs(frames));
if (NS_FAILED(rv)) {
return rv;
}
uint32_t length;
frames->GetLength(&length);
uint32_t i;
for (i = 0; i < length; i++) {
nsCOMPtr<nsIDOMWindow> childWin;
frames->Item(i, getter_AddRefs(childWin));
DispatchEventToWindow(childWin, eventType, tokenName);
uint32_t length;
frames->GetLength(&length);
uint32_t i;
for (i = 0; i < length; i++) {
nsCOMPtr<nsIDOMWindow> childWin;
frames->Item(i, getter_AddRefs(childWin));
DispatchEventToWindow(childWin, eventType, tokenName);
}
}
// check if we've enabled smart card events on this window
// NOTE: it's not an error to say that we aren't going to dispatch
// the event.
nsCOMPtr<nsIDOMCrypto> crypto;
domWin->GetCrypto(getter_AddRefs(crypto));
if (!crypto) {
return NS_OK; // nope, it doesn't have a crypto property
}
{
nsCOMPtr<nsIWindowCrypto> domWindow = do_QueryInterface(domWin);
if (!domWindow) {
return NS_OK; // nope, it's not an internal window
}
bool boolrv;
crypto->GetEnableSmartCardEvents(&boolrv);
if (!boolrv) {
return NS_OK; // nope, it's not enabled.
nsCOMPtr<nsIDOMCrypto> crypto;
domWindow->GetCrypto(getter_AddRefs(crypto));
if (!crypto) {
return NS_OK; // nope, it doesn't have a crypto property
}
bool boolrv;
crypto->GetEnableSmartCardEvents(&boolrv);
if (!boolrv) {
return NS_OK; // nope, it's not enabled.
}
}
// dispatch the event ...
nsresult rv;
// find the document
nsCOMPtr<nsIDOMDocument> doc;
rv = domWin->GetDocument(getter_AddRefs(doc));
@ -540,9 +534,11 @@ nsNSSComponent::DispatchEventToWindow(nsIDOMWindow *domWin,
return rv;
}
return target->DispatchEvent(smartCardEvent, &boolrv);
bool boolrv;
rv = target->DispatchEvent(smartCardEvent, &boolrv);
return rv;
}
#endif // MOZ_DISABLE_CRYPTOLEGACY
NS_IMETHODIMP
nsNSSComponent::PIPBundleFormatStringFromName(const char *name,
@ -624,7 +620,6 @@ nsNSSComponent::GetNSSBundleString(const char *name,
return rv;
}
#ifndef MOZ_DISABLE_CRYPTOLEGACY
void
nsNSSComponent::LaunchSmartCardThreads()
{
@ -680,7 +675,6 @@ nsNSSComponent::ShutdownSmartCardThreads()
delete mThreadList;
mThreadList = nullptr;
}
#endif // MOZ_DISABLE_CRYPTOLEGACY
static char *
nss_addEscape(const char *string, char quote)
@ -1806,9 +1800,7 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
InstallLoadableRoots();
#ifndef MOZ_DISABLE_CRYPTOLEGACY
LaunchSmartCardThreads();
#endif
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
}
@ -1856,9 +1848,7 @@ nsNSSComponent::ShutdownNSS()
mPrefBranch->RemoveObserver("security.", this);
}
#ifndef MOZ_DISABLE_CRYPTOLEGACY
ShutdownSmartCardThreads();
#endif
SSL_ClearSessionCache();
UnloadLoadableRoots();
CleanupIdentityInfo();

16
security/manager/ssl/src/nsNSSComponent.h
View File

@ -16,15 +16,13 @@
#include "nsIEntropyCollector.h"
#include "nsString.h"
#include "nsIStringBundle.h"
#include "nsIDOMEventTarget.h"
#include "nsIPrefBranch.h"
#include "nsIObserver.h"
#include "nsIObserverService.h"
#include "nsWeakReference.h"
#include "nsIScriptSecurityManager.h"
#ifndef MOZ_DISABLE_CRYPTOLEGACY
#include "nsIDOMEventTarget.h"
#include "nsSmartCardMonitor.h"
#endif
#include "nsINSSErrorsService.h"
#include "nsITimer.h"
#include "nsNetUtil.h"
@ -148,7 +146,6 @@ class NS_NO_VTABLE nsINSSComponent : public nsISupports {
NS_IMETHOD LogoutAuthenticatedPK11() = 0;
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NS_IMETHOD LaunchSmartCardThread(SECMODModule *module) = 0;
NS_IMETHOD ShutdownSmartCardThread(SECMODModule *module) = 0;
@ -156,7 +153,6 @@ class NS_NO_VTABLE nsINSSComponent : public nsISupports {
NS_IMETHOD PostEvent(const nsAString &eventType, const nsAString &token) = 0;
NS_IMETHOD DispatchEvent(const nsAString &eventType, const nsAString &token) = 0;
#endif
NS_IMETHOD EnsureIdentityInfoLoaded() = 0;
@ -257,15 +253,10 @@ public:
NS_IMETHOD DownloadCRLDirectly(nsAutoString, nsAutoString);
NS_IMETHOD RememberCert(CERTCertificate *cert);
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NS_IMETHOD LaunchSmartCardThread(SECMODModule *module);
NS_IMETHOD ShutdownSmartCardThread(SECMODModule *module);
NS_IMETHOD PostEvent(const nsAString &eventType, const nsAString &token);
NS_IMETHOD DispatchEvent(const nsAString &eventType, const nsAString &token);
void LaunchSmartCardThreads();
void ShutdownSmartCardThreads();
nsresult DispatchEventToWindow(nsIDOMWindow *domWin, const nsAString &eventType, const nsAString &token);
#endif
NS_IMETHOD EnsureIdentityInfoLoaded();
NS_IMETHOD IsNSSInitialized(bool *initialized);
@ -284,6 +275,8 @@ private:
void InstallLoadableRoots();
void UnloadLoadableRoots();
void LaunchSmartCardThreads();
void ShutdownSmartCardThreads();
void CleanupIdentityInfo();
void setValidationOptions(nsIPrefBranch * pref);
nsresult InitializePIPNSSBundle();
@ -294,6 +287,7 @@ private:
nsresult DownloadCrlSilently();
nsresult PostCRLImportEvent(const nsCSubstring &urlString, nsIStreamListener *psmDownloader);
nsresult getParamsForNextCrlToDownload(nsAutoString *url, PRTime *time, nsAutoString *key);
nsresult DispatchEventToWindow(nsIDOMWindow *domWin, const nsAString &eventType, const nsAString &token);
// Methods that we use to handle the profile change notifications (and to
// synthesize a full profile change when we're just doing a profile startup):
@ -321,9 +315,7 @@ private:
bool mUpdateTimerInitialized;
static int mInstanceCount;
nsNSSShutDownList *mShutdownObjectList;
#ifndef MOZ_DISABLE_CRYPTOLEGACY
SmartCardThreadList *mThreadList;
#endif
bool mIsNetworkDown;
void deleteBackgroundThreads();

8
security/manager/ssl/src/nsNSSModule.cpp
View File

@ -186,9 +186,7 @@ NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsNSSCertCache)
#ifdef MOZ_XUL
NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCertTree)
#endif
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCrypto)
#endif
NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsPkcs11)
NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCMSSecureMessage)
NS_NSS_GENERIC_FACTORY_CONSTRUCTOR(nssEnsure, nsCMSDecoder)
@ -227,9 +225,7 @@ NS_DEFINE_NAMED_CID(NS_FORMPROCESSOR_CID);
NS_DEFINE_NAMED_CID(NS_CERTTREE_CID);
#endif
NS_DEFINE_NAMED_CID(NS_PKCS11_CID);
#ifndef MOZ_DISABLE_CRYPTOLEGACY
NS_DEFINE_NAMED_CID(NS_CRYPTO_CID);
#endif
NS_DEFINE_NAMED_CID(NS_CMSSECUREMESSAGE_CID);
NS_DEFINE_NAMED_CID(NS_CMSDECODER_CID);
NS_DEFINE_NAMED_CID(NS_CMSENCODER_CID);
@ -266,9 +262,7 @@ static const mozilla::Module::CIDEntry kNSSCIDs[] = {
{ &kNS_CERTTREE_CID, false, nullptr, nsCertTreeConstructor },
#endif
{ &kNS_PKCS11_CID, false, nullptr, nsPkcs11Constructor },
#ifndef MOZ_DISABLE_CRYPTOLEGACY
{ &kNS_CRYPTO_CID, false, nullptr, nsCryptoConstructor },
#endif
{ &kNS_CMSSECUREMESSAGE_CID, false, nullptr, nsCMSSecureMessageConstructor },
{ &kNS_CMSDECODER_CID, false, nullptr, nsCMSDecoderConstructor },
{ &kNS_CMSENCODER_CID, false, nullptr, nsCMSEncoderConstructor },
@ -308,9 +302,7 @@ static const mozilla::Module::ContractIDEntry kNSSContracts[] = {
{ NS_CERTTREE_CONTRACTID, &kNS_CERTTREE_CID },
#endif
{ NS_PKCS11_CONTRACTID, &kNS_PKCS11_CID },
#ifndef MOZ_DISABLE_CRYPTOLEGACY
{ NS_CRYPTO_CONTRACTID, &kNS_CRYPTO_CID },
#endif
{ NS_CMSSECUREMESSAGE_CONTRACTID, &kNS_CMSSECUREMESSAGE_CID },
{ NS_CMSDECODER_CONTRACTID, &kNS_CMSDECODER_CID },
{ NS_CMSENCODER_CONTRACTID, &kNS_CMSENCODER_CID },

10
security/manager/ssl/src/nsRandomGenerator.cpp
View File

@ -4,9 +4,6 @@
#include "nsRandomGenerator.h"
#include "pk11pub.h"
#include "secerr.h"
#include "prerror.h"
#include "nsNSSComponent.h"
////////////////////////////////////////////////////////////////////////////////
//// nsRandomGenerator
@ -28,12 +25,7 @@ nsRandomGenerator::GenerateRandomBytes(uint32_t aLength,
if (!buf)
return NS_ERROR_OUT_OF_MEMORY;
mozilla::ScopedPK11SlotInfo slot(PK11_GetInternalSlot());
if (slot == NULL) {
return NS_ERROR_FAILURE;
}
SECStatus srv = PK11_GenerateRandomOnSlot(slot, buf, aLength);
SECStatus srv = PK11_GenerateRandom(buf, aLength);
if (SECSuccess != srv) {
NS_Free(buf);
return NS_ERROR_FAILURE;