summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer/nss_decryptor_linux.cc
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-17 21:55:55 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-17 21:55:55 +0000
commit580522638fdabb4d48fe2eae68f263f61fda3129 (patch)
treec647913d4de33a69929a9d0dbfec7b17da678f5e /chrome/browser/importer/nss_decryptor_linux.cc
parent228890ac838a1b27efac2c8e379e005254ae126a (diff)
downloadchromium_src-580522638fdabb4d48fe2eae68f263f61fda3129.zip
chromium_src-580522638fdabb4d48fe2eae68f263f61fda3129.tar.gz
chromium_src-580522638fdabb4d48fe2eae68f263f61fda3129.tar.bz2
Cleaning up lines longer than 80 chars under src/chrome/browser.
Command: awk '{if ( length($0) > 80 ) { print FILENAME, FNR, $0 } }' *.cc *.h # recursive find . -type f \( -name '*.cc' -o -name '*.h' \) -exec awk '{if ( length($0) > 80 ) { print FILENAME, FNR, $0 } }' {} \; Patch by Pierre-Antoine LaFayette <pierre.lafayette@gmail.com> BUG=None TEST=None Code review URL: http://codereview.chromium.org/164566 Review URL: http://codereview.chromium.org/171066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/nss_decryptor_linux.cc')
-rw-r--r--chrome/browser/importer/nss_decryptor_linux.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/chrome/browser/importer/nss_decryptor_linux.cc b/chrome/browser/importer/nss_decryptor_linux.cc
index b30bfe8..a8e8d44 100644
--- a/chrome/browser/importer/nss_decryptor_linux.cc
+++ b/chrome/browser/importer/nss_decryptor_linux.cc
@@ -109,7 +109,10 @@ unpadBlock(SECItem *data, int blockSize, SECItem *result)
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; }
+ 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; }
@@ -138,8 +141,8 @@ loser:
/* decrypt a block */
static SECStatus
-pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
- CK_MECHANISM_TYPE type, PK11SymKey *key,
+pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
+ CK_MECHANISM_TYPE type, PK11SymKey *key,
SECItem *params, SECItem *in, SECItem *result)
{
PK11Context *ctx = 0;
@@ -156,7 +159,7 @@ pk11Decrypt(PK11SlotInfo *slot, PLArenaPool *arena,
paddedResult.data = static_cast<unsigned char*>(
PORT_ArenaAlloc(arena, paddedResult.len));
- rv = PK11_CipherOp(ctx, paddedResult.data,
+ rv = PK11_CipherOp(ctx, paddedResult.data,
(int*)&paddedResult.len, paddedResult.len,
in->data, in->len);
if (rv != SECSuccess) goto loser;
@@ -197,10 +200,10 @@ SECStatus NSSDecryptor::PK11SDR_DecryptWithSlot(
/* Use triple-DES (Should look up the algorithm) */
type = CKM_DES3_CBC;
key = PK11_FindFixedKey(slot, type, &sdrResult.keyid, cx);
- if (!key) {
- rv = SECFailure;
+ if (!key) {
+ rv = SECFailure;
} else {
- rv = pk11Decrypt(slot, arena, type, key, params,
+ rv = pk11Decrypt(slot, arena, type, key, params,
&sdrResult.data, result);
}