aboutsummaryrefslogtreecommitdiff
path: root/src/crypto/aes.cpp
diff options
context:
space:
mode:
authorpracticalswift <practicalswift@users.noreply.github.com>2017-06-04 22:45:22 +0200
committerpracticalswift <practicalswift@users.noreply.github.com>2017-06-05 00:52:36 +0200
commit90593ed92cfd5d49900a6fb6c2c10a482ab9fdbb (patch)
tree1f830a3679ef00b774dc8ac6b216366f2ed52a68 /src/crypto/aes.cpp
parentf259263a7b11c6ff925851985ef0082b0a190a57 (diff)
Limit variable scope
Diffstat (limited to 'src/crypto/aes.cpp')
-rw-r--r--src/crypto/aes.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index 1d469d0fb4..5e70d25eee 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -112,7 +112,6 @@ static int CBCEncrypt(const T& enc, const unsigned char iv[AES_BLOCKSIZE], const
template <typename T>
static int CBCDecrypt(const T& dec, const unsigned char iv[AES_BLOCKSIZE], const unsigned char* data, int size, bool pad, unsigned char* out)
{
- unsigned char padsize = 0;
int written = 0;
bool fail = false;
const unsigned char* prev = iv;
@@ -136,7 +135,7 @@ static int CBCDecrypt(const T& dec, const unsigned char iv[AES_BLOCKSIZE], const
if (pad) {
// If used, padding size is the value of the last decrypted byte. For
// it to be valid, It must be between 1 and AES_BLOCKSIZE.
- padsize = *--out;
+ unsigned char padsize = *--out;
fail = !padsize | (padsize > AES_BLOCKSIZE);
// If not well-formed, treat it as though there's no padding.