summaryrefslogtreecommitdiffstats
path: root/base/crypto
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 10:11:03 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 10:11:03 +0000
commit663d0eee608b4d6d5661a42f4e1a394a6e6df461 (patch)
tree9f589f6f68ed83a741ce05dc92d6ead95a618dbb /base/crypto
parent066d879745b30f0a9f2e4671880cf5de3ec72b08 (diff)
downloadchromium_src-663d0eee608b4d6d5661a42f4e1a394a6e6df461.zip
chromium_src-663d0eee608b4d6d5661a42f4e1a394a6e6df461.tar.gz
chromium_src-663d0eee608b4d6d5661a42f4e1a394a6e6df461.tar.bz2
Initialize members in Encryptor constructors.
BUG=None TEST=None CID=8517 Review URL: http://codereview.chromium.org/6482024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/crypto')
-rw-r--r--base/crypto/encryptor_mac.cc6
-rw-r--r--base/crypto/encryptor_nss.cc6
-rw-r--r--base/crypto/encryptor_openssl.cc5
-rw-r--r--base/crypto/encryptor_win.cc7
4 files changed, 16 insertions, 8 deletions
diff --git a/base/crypto/encryptor_mac.cc b/base/crypto/encryptor_mac.cc
index d27c62e..e26c6bd7 100644
--- a/base/crypto/encryptor_mac.cc
+++ b/base/crypto/encryptor_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,9 @@
namespace base {
-Encryptor::Encryptor() {
+Encryptor::Encryptor()
+ : key_(NULL),
+ mode_(CBC) {
}
Encryptor::~Encryptor() {
diff --git a/base/crypto/encryptor_nss.cc b/base/crypto/encryptor_nss.cc
index 737e8f2..6256d7a 100644
--- a/base/crypto/encryptor_nss.cc
+++ b/base/crypto/encryptor_nss.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,7 +13,9 @@
namespace base {
-Encryptor::Encryptor() {
+Encryptor::Encryptor()
+ : key_(NULL),
+ mode_(CBC) {
EnsureNSSInit();
}
diff --git a/base/crypto/encryptor_openssl.cc b/base/crypto/encryptor_openssl.cc
index 7e09545..0e101a0 100644
--- a/base/crypto/encryptor_openssl.cc
+++ b/base/crypto/encryptor_openssl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -45,7 +45,8 @@ class ScopedCipherCTX {
} // namespace
Encryptor::Encryptor()
- : key_(NULL) {
+ : key_(NULL),
+ mode_(CBC) {
}
Encryptor::~Encryptor() {
diff --git a/base/crypto/encryptor_win.cc b/base/crypto/encryptor_win.cc
index 4a137b3..1d732b5 100644
--- a/base/crypto/encryptor_win.cc
+++ b/base/crypto/encryptor_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -28,7 +28,10 @@ DWORD GetCipherBlockSize(HCRYPTKEY key) {
} // namespace
-Encryptor::Encryptor() {
+Encryptor::Encryptor()
+ : key_(NULL),
+ mode_(CBC),
+ block_size_(0) {
}
Encryptor::~Encryptor() {