mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-07 04:05:49 +00:00
ae04912e48
--HG-- rename : security/manager/ssl/src/CryptoTask.cpp => security/manager/ssl/CryptoTask.cpp rename : security/manager/ssl/src/CryptoTask.h => security/manager/ssl/CryptoTask.h rename : security/manager/ssl/src/CryptoUtil.h => security/manager/ssl/CryptoUtil.h rename : security/manager/ssl/src/IntolerantFallbackList.inc => security/manager/ssl/IntolerantFallbackList.inc rename : security/manager/ssl/src/NSSErrorsService.cpp => security/manager/ssl/NSSErrorsService.cpp rename : security/manager/ssl/src/NSSErrorsService.h => security/manager/ssl/NSSErrorsService.h rename : security/manager/ssl/src/PPSMContentDownloader.ipdl => security/manager/ssl/PPSMContentDownloader.ipdl rename : security/manager/ssl/src/PSMContentListener.cpp => security/manager/ssl/PSMContentListener.cpp rename : security/manager/ssl/src/PSMContentListener.h => security/manager/ssl/PSMContentListener.h rename : security/manager/ssl/src/PSMRunnable.cpp => security/manager/ssl/PSMRunnable.cpp rename : security/manager/ssl/src/PSMRunnable.h => security/manager/ssl/PSMRunnable.h rename : security/manager/ssl/src/PublicSSL.h => security/manager/ssl/PublicSSL.h rename : security/manager/ssl/src/SSLServerCertVerification.cpp => security/manager/ssl/SSLServerCertVerification.cpp rename : security/manager/ssl/src/SSLServerCertVerification.h => security/manager/ssl/SSLServerCertVerification.h rename : security/manager/ssl/src/ScopedNSSTypes.h => security/manager/ssl/ScopedNSSTypes.h rename : security/manager/ssl/src/SharedCertVerifier.h => security/manager/ssl/SharedCertVerifier.h rename : security/manager/ssl/src/SharedSSLState.cpp => security/manager/ssl/SharedSSLState.cpp rename : security/manager/ssl/src/SharedSSLState.h => security/manager/ssl/SharedSSLState.h rename : security/manager/ssl/src/TransportSecurityInfo.cpp => security/manager/ssl/TransportSecurityInfo.cpp rename : security/manager/ssl/src/TransportSecurityInfo.h => security/manager/ssl/TransportSecurityInfo.h rename : security/manager/ssl/src/md4.c => security/manager/ssl/md4.c rename : security/manager/ssl/src/md4.h => security/manager/ssl/md4.h rename : security/manager/ssl/src/nsCertOverrideService.cpp => security/manager/ssl/nsCertOverrideService.cpp rename : security/manager/ssl/src/nsCertOverrideService.h => security/manager/ssl/nsCertOverrideService.h rename : security/manager/ssl/src/nsCertPicker.cpp => security/manager/ssl/nsCertPicker.cpp rename : security/manager/ssl/src/nsCertPicker.h => security/manager/ssl/nsCertPicker.h rename : security/manager/ssl/src/nsCertTree.cpp => security/manager/ssl/nsCertTree.cpp rename : security/manager/ssl/src/nsCertTree.h => security/manager/ssl/nsCertTree.h rename : security/manager/ssl/src/nsCertVerificationThread.cpp => security/manager/ssl/nsCertVerificationThread.cpp rename : security/manager/ssl/src/nsCertVerificationThread.h => security/manager/ssl/nsCertVerificationThread.h rename : security/manager/ssl/src/nsClientAuthRemember.cpp => security/manager/ssl/nsClientAuthRemember.cpp rename : security/manager/ssl/src/nsClientAuthRemember.h => security/manager/ssl/nsClientAuthRemember.h rename : security/manager/ssl/src/nsCrypto.cpp => security/manager/ssl/nsCrypto.cpp rename : security/manager/ssl/src/nsCrypto.h => security/manager/ssl/nsCrypto.h rename : security/manager/ssl/src/nsCryptoHash.cpp => security/manager/ssl/nsCryptoHash.cpp rename : security/manager/ssl/src/nsCryptoHash.h => security/manager/ssl/nsCryptoHash.h rename : security/manager/ssl/src/nsDataSignatureVerifier.cpp => security/manager/ssl/nsDataSignatureVerifier.cpp rename : security/manager/ssl/src/nsDataSignatureVerifier.h => security/manager/ssl/nsDataSignatureVerifier.h rename : security/manager/ssl/src/nsKeyModule.cpp => security/manager/ssl/nsKeyModule.cpp rename : security/manager/ssl/src/nsKeyModule.h => security/manager/ssl/nsKeyModule.h rename : security/manager/ssl/src/nsKeygenHandler.cpp => security/manager/ssl/nsKeygenHandler.cpp rename : security/manager/ssl/src/nsKeygenHandler.h => security/manager/ssl/nsKeygenHandler.h rename : security/manager/ssl/src/nsKeygenHandlerContent.cpp => security/manager/ssl/nsKeygenHandlerContent.cpp rename : security/manager/ssl/src/nsKeygenHandlerContent.h => security/manager/ssl/nsKeygenHandlerContent.h rename : security/manager/ssl/src/nsKeygenThread.cpp => security/manager/ssl/nsKeygenThread.cpp rename : security/manager/ssl/src/nsKeygenThread.h => security/manager/ssl/nsKeygenThread.h rename : security/manager/ssl/src/nsNSSASN1Object.cpp => security/manager/ssl/nsNSSASN1Object.cpp rename : security/manager/ssl/src/nsNSSASN1Object.h => security/manager/ssl/nsNSSASN1Object.h rename : security/manager/ssl/src/nsNSSCallbacks.cpp => security/manager/ssl/nsNSSCallbacks.cpp rename : security/manager/ssl/src/nsNSSCallbacks.h => security/manager/ssl/nsNSSCallbacks.h rename : security/manager/ssl/src/nsNSSCertHelper.cpp => security/manager/ssl/nsNSSCertHelper.cpp rename : security/manager/ssl/src/nsNSSCertHelper.h => security/manager/ssl/nsNSSCertHelper.h rename : security/manager/ssl/src/nsNSSCertTrust.cpp => security/manager/ssl/nsNSSCertTrust.cpp rename : security/manager/ssl/src/nsNSSCertTrust.h => security/manager/ssl/nsNSSCertTrust.h rename : security/manager/ssl/src/nsNSSCertValidity.cpp => security/manager/ssl/nsNSSCertValidity.cpp rename : security/manager/ssl/src/nsNSSCertValidity.h => security/manager/ssl/nsNSSCertValidity.h rename : security/manager/ssl/src/nsNSSCertificate.cpp => security/manager/ssl/nsNSSCertificate.cpp rename : security/manager/ssl/src/nsNSSCertificate.h => security/manager/ssl/nsNSSCertificate.h rename : security/manager/ssl/src/nsNSSCertificateDB.cpp => security/manager/ssl/nsNSSCertificateDB.cpp rename : security/manager/ssl/src/nsNSSCertificateDB.h => security/manager/ssl/nsNSSCertificateDB.h rename : security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp => security/manager/ssl/nsNSSCertificateFakeTransport.cpp rename : security/manager/ssl/src/nsNSSCertificateFakeTransport.h => security/manager/ssl/nsNSSCertificateFakeTransport.h rename : security/manager/ssl/src/nsNSSComponent.cpp => security/manager/ssl/nsNSSComponent.cpp rename : security/manager/ssl/src/nsNSSComponent.h => security/manager/ssl/nsNSSComponent.h rename : security/manager/ssl/src/nsNSSErrors.cpp => security/manager/ssl/nsNSSErrors.cpp rename : security/manager/ssl/src/nsNSSHelper.h => security/manager/ssl/nsNSSHelper.h rename : security/manager/ssl/src/nsNSSIOLayer.cpp => security/manager/ssl/nsNSSIOLayer.cpp rename : security/manager/ssl/src/nsNSSIOLayer.h => security/manager/ssl/nsNSSIOLayer.h rename : security/manager/ssl/src/nsNSSModule.cpp => security/manager/ssl/nsNSSModule.cpp rename : security/manager/ssl/src/nsNSSShutDown.cpp => security/manager/ssl/nsNSSShutDown.cpp rename : security/manager/ssl/src/nsNSSShutDown.h => security/manager/ssl/nsNSSShutDown.h rename : security/manager/ssl/src/nsNSSVersion.cpp => security/manager/ssl/nsNSSVersion.cpp rename : security/manager/ssl/src/nsNSSVersion.h => security/manager/ssl/nsNSSVersion.h rename : security/manager/ssl/src/nsNTLMAuthModule.cpp => security/manager/ssl/nsNTLMAuthModule.cpp rename : security/manager/ssl/src/nsNTLMAuthModule.h => security/manager/ssl/nsNTLMAuthModule.h rename : security/manager/ssl/src/nsPK11TokenDB.cpp => security/manager/ssl/nsPK11TokenDB.cpp rename : security/manager/ssl/src/nsPK11TokenDB.h => security/manager/ssl/nsPK11TokenDB.h rename : security/manager/ssl/src/nsPKCS11Slot.cpp => security/manager/ssl/nsPKCS11Slot.cpp rename : security/manager/ssl/src/nsPKCS11Slot.h => security/manager/ssl/nsPKCS11Slot.h rename : security/manager/ssl/src/nsPKCS12Blob.cpp => security/manager/ssl/nsPKCS12Blob.cpp rename : security/manager/ssl/src/nsPKCS12Blob.h => security/manager/ssl/nsPKCS12Blob.h rename : security/manager/ssl/src/nsPSMBackgroundThread.cpp => security/manager/ssl/nsPSMBackgroundThread.cpp rename : security/manager/ssl/src/nsPSMBackgroundThread.h => security/manager/ssl/nsPSMBackgroundThread.h rename : security/manager/ssl/src/nsProtectedAuthThread.cpp => security/manager/ssl/nsProtectedAuthThread.cpp rename : security/manager/ssl/src/nsProtectedAuthThread.h => security/manager/ssl/nsProtectedAuthThread.h rename : security/manager/ssl/src/nsRandomGenerator.cpp => security/manager/ssl/nsRandomGenerator.cpp rename : security/manager/ssl/src/nsRandomGenerator.h => security/manager/ssl/nsRandomGenerator.h rename : security/manager/ssl/src/nsSDR.cpp => security/manager/ssl/nsSDR.cpp rename : security/manager/ssl/src/nsSDR.h => security/manager/ssl/nsSDR.h rename : security/manager/ssl/src/nsSSLSocketProvider.cpp => security/manager/ssl/nsSSLSocketProvider.cpp rename : security/manager/ssl/src/nsSSLSocketProvider.h => security/manager/ssl/nsSSLSocketProvider.h rename : security/manager/ssl/src/nsSSLStatus.cpp => security/manager/ssl/nsSSLStatus.cpp rename : security/manager/ssl/src/nsSSLStatus.h => security/manager/ssl/nsSSLStatus.h rename : security/manager/ssl/src/nsSmartCardMonitor.cpp => security/manager/ssl/nsSmartCardMonitor.cpp rename : security/manager/ssl/src/nsSmartCardMonitor.h => security/manager/ssl/nsSmartCardMonitor.h rename : security/manager/ssl/src/nsTLSSocketProvider.cpp => security/manager/ssl/nsTLSSocketProvider.cpp rename : security/manager/ssl/src/nsTLSSocketProvider.h => security/manager/ssl/nsTLSSocketProvider.h rename : security/manager/ssl/src/nsUsageArrayHelper.cpp => security/manager/ssl/nsUsageArrayHelper.cpp rename : security/manager/ssl/src/nsUsageArrayHelper.h => security/manager/ssl/nsUsageArrayHelper.h rename : security/manager/ssl/src/nsVerificationJob.h => security/manager/ssl/nsVerificationJob.h
255 lines
6.2 KiB
C++
255 lines
6.2 KiB
C++
/* -*- 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 "pk11func.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsKeygenThread.h"
|
|
#include "nsIObserver.h"
|
|
#include "nsNSSShutDown.h"
|
|
#include "PSMRunnable.h"
|
|
#include "mozilla/DebugOnly.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::psm;
|
|
|
|
NS_IMPL_ISUPPORTS(nsKeygenThread, nsIKeygenThread)
|
|
|
|
|
|
nsKeygenThread::nsKeygenThread()
|
|
:mutex("nsKeygenThread.mutex"),
|
|
iAmRunning(false),
|
|
keygenReady(false),
|
|
statusDialogClosed(false),
|
|
alreadyReceivedParams(false),
|
|
privateKey(nullptr),
|
|
publicKey(nullptr),
|
|
slot(nullptr),
|
|
flags(0),
|
|
altSlot(nullptr),
|
|
altFlags(0),
|
|
usedSlot(nullptr),
|
|
keyGenMechanism(0),
|
|
params(nullptr),
|
|
wincx(nullptr),
|
|
threadHandle(nullptr)
|
|
{
|
|
}
|
|
|
|
nsKeygenThread::~nsKeygenThread()
|
|
{
|
|
// clean up in the unlikely case that nobody consumed our results
|
|
|
|
if (privateKey)
|
|
SECKEY_DestroyPrivateKey(privateKey);
|
|
|
|
if (publicKey)
|
|
SECKEY_DestroyPublicKey(publicKey);
|
|
|
|
if (usedSlot)
|
|
PK11_FreeSlot(usedSlot);
|
|
}
|
|
|
|
void nsKeygenThread::SetParams(
|
|
PK11SlotInfo *a_slot,
|
|
PK11AttrFlags a_flags,
|
|
PK11SlotInfo *a_alternative_slot,
|
|
PK11AttrFlags a_alternative_flags,
|
|
uint32_t a_keyGenMechanism,
|
|
void *a_params,
|
|
void *a_wincx )
|
|
{
|
|
nsNSSShutDownPreventionLock locker;
|
|
MutexAutoLock lock(mutex);
|
|
|
|
if (!alreadyReceivedParams) {
|
|
alreadyReceivedParams = true;
|
|
slot = (a_slot) ? PK11_ReferenceSlot(a_slot) : nullptr;
|
|
flags = a_flags;
|
|
altSlot = (a_alternative_slot) ? PK11_ReferenceSlot(a_alternative_slot) : nullptr;
|
|
altFlags = a_alternative_flags;
|
|
keyGenMechanism = a_keyGenMechanism;
|
|
params = a_params;
|
|
wincx = a_wincx;
|
|
}
|
|
}
|
|
|
|
nsresult nsKeygenThread::ConsumeResult(
|
|
PK11SlotInfo **a_used_slot,
|
|
SECKEYPrivateKey **a_privateKey,
|
|
SECKEYPublicKey **a_publicKey)
|
|
{
|
|
if (!a_used_slot || !a_privateKey || !a_publicKey) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsresult rv;
|
|
|
|
MutexAutoLock lock(mutex);
|
|
|
|
// GetParams must not be called until thread creator called
|
|
// Join on this thread.
|
|
NS_ASSERTION(keygenReady, "logic error in nsKeygenThread::GetParams");
|
|
|
|
if (keygenReady) {
|
|
*a_privateKey = privateKey;
|
|
*a_publicKey = publicKey;
|
|
*a_used_slot = usedSlot;
|
|
|
|
privateKey = 0;
|
|
publicKey = 0;
|
|
usedSlot = 0;
|
|
|
|
rv = NS_OK;
|
|
}
|
|
else {
|
|
rv = NS_ERROR_FAILURE;
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
static void nsKeygenThreadRunner(void *arg)
|
|
{
|
|
PR_SetCurrentThreadName("Keygen");
|
|
nsKeygenThread *self = static_cast<nsKeygenThread *>(arg);
|
|
self->Run();
|
|
}
|
|
|
|
nsresult nsKeygenThread::StartKeyGeneration(nsIObserver* aObserver)
|
|
{
|
|
if (!NS_IsMainThread()) {
|
|
NS_ERROR("nsKeygenThread::StartKeyGeneration called off the main thread");
|
|
return NS_ERROR_NOT_SAME_THREAD;
|
|
}
|
|
|
|
if (!aObserver)
|
|
return NS_OK;
|
|
|
|
MutexAutoLock lock(mutex);
|
|
|
|
if (iAmRunning || keygenReady) {
|
|
return NS_OK;
|
|
}
|
|
|
|
// We must AddRef aObserver only here on the main thread, because it
|
|
// probably does not implement a thread-safe AddRef.
|
|
mNotifyObserver = new NotifyObserverRunnable(aObserver, "keygen-finished");
|
|
|
|
iAmRunning = true;
|
|
|
|
threadHandle = PR_CreateThread(PR_USER_THREAD, nsKeygenThreadRunner, static_cast<void*>(this),
|
|
PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0);
|
|
|
|
// bool thread_started_ok = (threadHandle != nullptr);
|
|
// we might want to return "thread started ok" to caller in the future
|
|
NS_ASSERTION(threadHandle, "Could not create nsKeygenThreadRunner thread\n");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult nsKeygenThread::UserCanceled(bool *threadAlreadyClosedDialog)
|
|
{
|
|
if (!threadAlreadyClosedDialog)
|
|
return NS_OK;
|
|
|
|
*threadAlreadyClosedDialog = false;
|
|
|
|
MutexAutoLock lock(mutex);
|
|
|
|
if (keygenReady)
|
|
*threadAlreadyClosedDialog = statusDialogClosed;
|
|
|
|
// User somehow closed the dialog, but we will not cancel.
|
|
// Bad luck, we told him not do, and user still has to wait.
|
|
// However, we remember that it's closed and will not close
|
|
// it again to avoid problems.
|
|
statusDialogClosed = true;
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void nsKeygenThread::Run(void)
|
|
{
|
|
nsNSSShutDownPreventionLock locker;
|
|
bool canGenerate = false;
|
|
|
|
{
|
|
MutexAutoLock lock(mutex);
|
|
if (alreadyReceivedParams) {
|
|
canGenerate = true;
|
|
keygenReady = false;
|
|
}
|
|
}
|
|
|
|
if (canGenerate) {
|
|
privateKey = PK11_GenerateKeyPairWithFlags(slot, keyGenMechanism,
|
|
params, &publicKey,
|
|
flags, wincx);
|
|
|
|
if (privateKey) {
|
|
usedSlot = PK11_ReferenceSlot(slot);
|
|
}
|
|
else if (altSlot) {
|
|
privateKey = PK11_GenerateKeyPairWithFlags(altSlot, keyGenMechanism,
|
|
params, &publicKey,
|
|
altFlags, wincx);
|
|
if (privateKey) {
|
|
usedSlot = PK11_ReferenceSlot(altSlot);
|
|
}
|
|
}
|
|
}
|
|
|
|
// This call gave us ownership over privateKey and publicKey.
|
|
// But as the params structure is owner by our caller,
|
|
// we effectively transferred ownership to the caller.
|
|
// As long as key generation can't be canceled, we don't need
|
|
// to care for cleaning this up.
|
|
|
|
nsCOMPtr<nsIRunnable> notifyObserver;
|
|
{
|
|
MutexAutoLock lock(mutex);
|
|
|
|
keygenReady = true;
|
|
iAmRunning = false;
|
|
|
|
// forget our parameters
|
|
if (slot) {
|
|
PK11_FreeSlot(slot);
|
|
slot = 0;
|
|
}
|
|
if (altSlot) {
|
|
PK11_FreeSlot(altSlot);
|
|
altSlot = 0;
|
|
}
|
|
keyGenMechanism = 0;
|
|
params = 0;
|
|
wincx = 0;
|
|
|
|
if (!statusDialogClosed && mNotifyObserver)
|
|
notifyObserver = mNotifyObserver;
|
|
|
|
mNotifyObserver = nullptr;
|
|
}
|
|
|
|
if (notifyObserver) {
|
|
DebugOnly<nsresult> rv = NS_DispatchToMainThread(notifyObserver);
|
|
NS_ASSERTION(NS_SUCCEEDED(rv),
|
|
"failed to dispatch keygen thread observer to main thread");
|
|
}
|
|
}
|
|
|
|
void nsKeygenThread::Join()
|
|
{
|
|
if (!threadHandle)
|
|
return;
|
|
|
|
PR_JoinThread(threadHandle);
|
|
threadHandle = nullptr;
|
|
|
|
return;
|
|
}
|