| Index: chrome/browser/importer/nss_decryptor_linux.cc
|
| diff --git a/chrome/browser/importer/nss_decryptor_linux.cc b/chrome/browser/importer/nss_decryptor_linux.cc
|
| index cde9e57e6e1ed31372a5cc2aa4c06fbfb4635c81..b30bfe87aceb76f8bdb72a980ab3cab234c445fc 100644
|
| --- a/chrome/browser/importer/nss_decryptor_linux.cc
|
| +++ b/chrome/browser/importer/nss_decryptor_linux.cc
|
| @@ -4,14 +4,211 @@
|
|
|
| #include "chrome/browser/importer/nss_decryptor_linux.h"
|
|
|
| +#include <pk11pub.h>
|
| +#include <pk11sdr.h>
|
| +
|
| +#include "base/basictypes.h"
|
| #include "base/nss_init.h"
|
| +#include "base/string_util.h"
|
| +#include "base/sys_string_conversions.h"
|
|
|
| -NSSDecryptor::NSSDecryptor() : is_nss_initialized_(false) {}
|
| -NSSDecryptor::~NSSDecryptor() {}
|
| +NSSDecryptor::NSSDecryptor() : is_nss_initialized_(false), db_slot_(NULL) {}
|
| +NSSDecryptor::~NSSDecryptor() {
|
| + if (db_slot_) {
|
| + // Deliberately leave the user db open, just in case we need to open more
|
| + // than one, because there's an NSS bug with reopening user dbs.
|
| + // https://bugzilla.mozilla.org/show_bug.cgi?id=506140
|
| + // SECMOD_CloseUserDB(db_slot_);
|
| + PK11_FreeSlot(db_slot_);
|
| + }
|
| +}
|
|
|
| bool NSSDecryptor::Init(const std::wstring& /* dll_path */,
|
| - const std::wstring& /* db_path */) {
|
| + const std::wstring& db_path) {
|
| base::EnsureNSSInit();
|
| is_nss_initialized_ = true;
|
| - return true;
|
| + const std::string modspec =
|
| + StringPrintf("configDir='%s' tokenDescription='Firefox NSS database' "
|
| + "flags=readOnly", base::SysWideToNativeMB(db_path).c_str());
|
| + db_slot_ = SECMOD_OpenUserDB(modspec.c_str());
|
| + return db_slot_ != NULL;
|
| +}
|
| +
|
| +// This method is based on some NSS code in
|
| +// security/nss/lib/pk11wrap/pk11sdr.c
|
| +// This code is copied because the implementation assumes the use of the
|
| +// internal key slot for decryption, but we need to use another slot.
|
| +// The license block is:
|
| +/* ***** BEGIN LICENSE BLOCK *****
|
| + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
| + *
|
| + * The contents of this file are subject to the Mozilla Public License Version
|
| + * 1.1 (the "License"); you may not use this file except in compliance with
|
| + * the License. You may obtain a copy of the License at
|
| + * http://www.mozilla.org/MPL/
|
| + *
|
| + * Software distributed under the License is distributed on an "AS IS" basis,
|
| + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
| + * for the specific language governing rights and limitations under the
|
| + * License.
|
| + *
|
| + * The Original Code is the Netscape security libraries.
|
| + *
|
| + * The Initial Developer of the Original Code is
|
| + * Netscape Communications Corporation.
|
| + * Portions created by the Initial Developer are Copyright (C) 1994-2000
|
| + * the Initial Developer. All Rights Reserved.
|
| + *
|
| + * Contributor(s):
|
| + * thayes@netscape.com
|
| + *
|
| + * Alternatively, the contents of this file may be used under the terms of
|
| + * either the GNU General Public License Version 2 or later (the "GPL"), or
|
| + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
| + * in which case the provisions of the GPL or the LGPL are applicable instead
|
| + * of those above. If you wish to allow use of your version of this file only
|
| + * under the terms of either the GPL or the LGPL, and not to allow others to
|
| + * use your version of this file under the terms of the MPL, indicate your
|
| + * decision by deleting the provisions above and replace them with the notice
|
| + * and other provisions required by the GPL or the LGPL. If you do not delete
|
| + * the provisions above, a recipient may use your version of this file under
|
| + * the terms of any one of the MPL, the GPL or the LGPL.
|
| + *
|
| + * ***** END LICENSE BLOCK ***** */
|
| +
|
| +/*
|
| + * Data structure and template for encoding the result of an SDR operation
|
| + * This is temporary. It should include the algorithm ID of the encryption
|
| + * mechanism
|
| + */
|
| +struct SDRResult
|
| +{
|
| + SECItem keyid;
|
| + SECAlgorithmID alg;
|
| + SECItem data;
|
| +};
|
| +typedef struct SDRResult SDRResult;
|
| +
|
| +static SEC_ASN1Template g_template[] = {
|
| + { SEC_ASN1_SEQUENCE, 0, NULL, sizeof (SDRResult) },
|
| + { SEC_ASN1_OCTET_STRING, offsetof(SDRResult, keyid) },
|
| + { SEC_ASN1_INLINE | SEC_ASN1_XTRN, offsetof(SDRResult, alg),
|
| + SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
|
| + { SEC_ASN1_OCTET_STRING, offsetof(SDRResult, data) },
|
| + { 0 }
|
| +};
|
| +
|
| +static SECStatus
|
| +unpadBlock(SECItem *data, int blockSize, SECItem *result)
|
| +{
|
| + SECStatus rv = SECSuccess;
|
| + int padLength;
|
| + int i;
|
| +
|
| + result->data = 0;
|
| + result->len = 0;
|
| +
|
| + /* Remove the padding from the end if the input data */
|
| + if (data->len == 0 || data->len % blockSize != 0) { rv = SECFailure; goto loser; }
|
| +
|
| + padLength = data->data[data->len-1];
|
| + if (padLength > blockSize) { rv = SECFailure; goto loser; }
|
| +
|
| + /* verify padding */
|
| + for (i=data->len - padLength; static_cast<uint32>(i) < data->len; i++) {
|
| + if (data->data[i] != padLength) {
|
| + rv = SECFailure;
|
| + goto loser;
|
| + }
|
| + }
|
| +
|
| + result->len = data->len - padLength;
|
| + result->data = (unsigned char *)PORT_Alloc(result->len);
|
| + if (!result->data) { rv = SECFailure; goto loser; }
|
| +
|
| + PORT_Memcpy(result->data, data->data, result->len);
|
| +
|
| + if (padLength < 2) {
|
| + return SECWouldBlock;
|
| + }
|
| +
|
| +loser:
|
| + return rv;
|
| +}
|
| +
|
| +/* decrypt a block */
|
| +static SECStatus
|
| +pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
|
| + CK_MECHANISM_TYPE type, PK11SymKey *key,
|
| + SECItem *params, SECItem *in, SECItem *result)
|
| +{
|
| + PK11Context *ctx = 0;
|
| + SECItem paddedResult;
|
| + SECStatus rv;
|
| +
|
| + paddedResult.len = 0;
|
| + paddedResult.data = 0;
|
| +
|
| + ctx = PK11_CreateContextBySymKey(type, CKA_DECRYPT, key, params);
|
| + if (!ctx) { rv = SECFailure; goto loser; }
|
| +
|
| + paddedResult.len = in->len;
|
| + paddedResult.data = static_cast<unsigned char*>(
|
| + PORT_ArenaAlloc(arena, paddedResult.len));
|
| +
|
| + rv = PK11_CipherOp(ctx, paddedResult.data,
|
| + (int*)&paddedResult.len, paddedResult.len,
|
| + in->data, in->len);
|
| + if (rv != SECSuccess) goto loser;
|
| +
|
| + PK11_Finalize(ctx);
|
| +
|
| + /* Remove the padding */
|
| + rv = unpadBlock(&paddedResult, PK11_GetBlockSize(type, 0), result);
|
| + if (rv) goto loser;
|
| +
|
| +loser:
|
| + if (ctx) PK11_DestroyContext(ctx, PR_TRUE);
|
| + return rv;
|
| +}
|
| +
|
| +SECStatus NSSDecryptor::PK11SDR_DecryptWithSlot(
|
| + PK11SlotInfo* slot, SECItem* data, SECItem* result, void* cx) const {
|
| + SECStatus rv = SECSuccess;
|
| + PK11SymKey *key = 0;
|
| + CK_MECHANISM_TYPE type;
|
| + SDRResult sdrResult;
|
| + SECItem *params = 0;
|
| + SECItem possibleResult = { static_cast<SECItemType>(0), NULL, 0 };
|
| + PLArenaPool *arena = 0;
|
| +
|
| + arena = PORT_NewArena(SEC_ASN1_DEFAULT_ARENA_SIZE);
|
| + if (!arena) { rv = SECFailure; goto loser; }
|
| +
|
| + /* Decode the incoming data */
|
| + memset(&sdrResult, 0, sizeof sdrResult);
|
| + rv = SEC_QuickDERDecodeItem(arena, &sdrResult, g_template, data);
|
| + if (rv != SECSuccess) goto loser; /* Invalid format */
|
| +
|
| + /* Get the parameter values from the data */
|
| + params = PK11_ParamFromAlgid(&sdrResult.alg);
|
| + if (!params) { rv = SECFailure; goto loser; }
|
| +
|
| + /* Use triple-DES (Should look up the algorithm) */
|
| + type = CKM_DES3_CBC;
|
| + key = PK11_FindFixedKey(slot, type, &sdrResult.keyid, cx);
|
| + if (!key) {
|
| + rv = SECFailure;
|
| + } else {
|
| + rv = pk11Decrypt(slot, arena, type, key, params,
|
| + &sdrResult.data, result);
|
| + }
|
| +
|
| + loser:
|
| + if (arena) PORT_FreeArena(arena, PR_TRUE);
|
| + if (key) PK11_FreeSymKey(key);
|
| + if (params) SECITEM_ZfreeItem(params, PR_TRUE);
|
| + if (possibleResult.data) SECITEM_ZfreeItem(&possibleResult, PR_FALSE);
|
| +
|
| + return rv;
|
| }
|
|
|