diff --git a/share/keepassx/license.html b/share/keepassx/license.html
index 94696c0..7e7d943 100644
--- a/share/keepassx/license.html
+++ b/share/keepassx/license.html
@@ -1,5 +1,5 @@
-Copyright (C) 2005-2007 Tarek Saidi <tarek.saidi@arcor.de>
-Copyright (C) 2007-2008 Felix Geyer <debfx-keepassx@fobos.de>
+Copyright (C) 2005-2008 Tarek Saidi <tarek.saidi@arcor.de>
+Copyright (C) 2007-2009 Felix Geyer <debfx-keepassx {at} fobos.de>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/crypto/aescpp.h b/src/crypto/aescpp.h
index a623035..4523cca 100644
--- a/src/crypto/aescpp.h
+++ b/src/crypto/aescpp.h
@@ -37,64 +37,65 @@
class AESencrypt
{
public:
- aes_encrypt_ctx cx[1];
- AESencrypt(void) { aes_init(); };
+ AESencrypt(void) { aes_init(); };
#if defined(AES_128)
- AESencrypt(const unsigned char key[])
- { aes_encrypt_key128(key, cx); }
- AES_RETURN key128(const unsigned char key[])
- { return aes_encrypt_key128(key, cx); }
+ AESencrypt(const unsigned char key[])
+ { aes_encrypt_key128(key, cx); }
+ inline AES_RETURN key128(const unsigned char key[])
+ { return aes_encrypt_key128(key, cx); }
#endif
#if defined(AES_192)
- AES_RETURN key192(const unsigned char key[])
- { return aes_encrypt_key192(key, cx); }
+ inline AES_RETURN key192(const unsigned char key[])
+ { return aes_encrypt_key192(key, cx); }
#endif
#if defined(AES_256)
- AES_RETURN key256(const unsigned char key[])
- { return aes_encrypt_key256(key, cx); }
+ inline AES_RETURN key256(const unsigned char key[])
+ { return aes_encrypt_key256(key, cx); }
#endif
#if defined(AES_VAR)
- AES_RETURN key(const unsigned char key[], int key_len)
- { return aes_encrypt_key(key, key_len, cx); }
+ inline AES_RETURN key(const unsigned char key[], int key_len)
+ { return aes_encrypt_key(key, key_len, cx); }
#endif
- AES_RETURN encrypt(const unsigned char in[], unsigned char out[]) const
- { return aes_encrypt(in, out, cx); }
+ inline AES_RETURN encrypt(const unsigned char in[], unsigned char out[]) const
+ { return aes_encrypt(in, out, cx); }
#ifndef AES_MODES
- AES_RETURN ecb_encrypt(const unsigned char in[], unsigned char out[], int nb) const
- { while(nb--)
- { aes_encrypt(in, out, cx), in += AES_BLOCK_SIZE, out += AES_BLOCK_SIZE; }
- }
+ inline AES_RETURN ecb_encrypt(const unsigned char in[], unsigned char out[], int nb) const
+ { while(nb--)
+ { aes_encrypt(in, out, cx), in += AES_BLOCK_SIZE, out += AES_BLOCK_SIZE; }
+ }
#endif
#ifdef AES_MODES
- AES_RETURN mode_reset(void) { return aes_mode_reset(cx); }
+ inline AES_RETURN mode_reset(void) { return aes_mode_reset(cx); }
- AES_RETURN ecb_encrypt(const unsigned char in[], unsigned char out[], int nb) const
- { return aes_ecb_encrypt(in, out, nb, cx); }
+ inline AES_RETURN ecb_encrypt(const unsigned char in[], unsigned char out[], int nb) const
+ { return aes_ecb_encrypt(in, out, nb, cx); }
- AES_RETURN cbc_encrypt(const unsigned char in[], unsigned char out[], int nb,
- unsigned char iv[]) const
- { return aes_cbc_encrypt(in, out, nb, iv, cx); }
+ inline AES_RETURN cbc_encrypt(const unsigned char in[], unsigned char out[], int nb,
+ unsigned char iv[]) const
+ { return aes_cbc_encrypt(in, out, nb, iv, cx); }
- AES_RETURN cfb_encrypt(const unsigned char in[], unsigned char out[], int nb,
- unsigned char iv[])
- { return aes_cfb_encrypt(in, out, nb, iv, cx); }
+ inline AES_RETURN cfb_encrypt(const unsigned char in[], unsigned char out[], int nb,
+ unsigned char iv[])
+ { return aes_cfb_encrypt(in, out, nb, iv, cx); }
- AES_RETURN cfb_decrypt(const unsigned char in[], unsigned char out[], int nb,
- unsigned char iv[])
- { return aes_cfb_decrypt(in, out, nb, iv, cx); }
+ inline AES_RETURN cfb_decrypt(const unsigned char in[], unsigned char out[], int nb,
+ unsigned char iv[])
+ { return aes_cfb_decrypt(in, out, nb, iv, cx); }
- AES_RETURN ofb_crypt(const unsigned char in[], unsigned char out[], int nb,
- unsigned char iv[])
- { return aes_ofb_crypt(in, out, nb, iv, cx); }
+ inline AES_RETURN ofb_crypt(const unsigned char in[], unsigned char out[], int nb,
+ unsigned char iv[])
+ { return aes_ofb_crypt(in, out, nb, iv, cx); }
- typedef void ctr_fn(unsigned char ctr[]);
+ typedef void ctr_fn(unsigned char ctr[]);
- AES_RETURN ctr_crypt(const unsigned char in[], unsigned char out[], int nb,
- unsigned char iv[], ctr_fn cf)
- { return aes_ctr_crypt(in, out, nb, iv, cf, cx); }
+ inline AES_RETURN ctr_crypt(const unsigned char in[], unsigned char out[], int nb,
+ unsigned char iv[], ctr_fn cf)
+ { return aes_ctr_crypt(in, out, nb, iv, cf, cx); }
#endif
+private:
+ aes_encrypt_ctx cx[1];
};
#endif
@@ -104,43 +105,44 @@ public:
class AESdecrypt
{
public:
- aes_decrypt_ctx cx[1];
- AESdecrypt(void) { aes_init(); };
+ AESdecrypt(void) { aes_init(); };
#if defined(AES_128)
- AESdecrypt(const unsigned char key[])
- { aes_decrypt_key128(key, cx); }
- AES_RETURN key128(const unsigned char key[])
- { return aes_decrypt_key128(key, cx); }
+ AESdecrypt(const unsigned char key[])
+ { aes_decrypt_key128(key, cx); }
+ inline AES_RETURN key128(const unsigned char key[])
+ { return aes_decrypt_key128(key, cx); }
#endif
#if defined(AES_192)
- AES_RETURN key192(const unsigned char key[])
- { return aes_decrypt_key192(key, cx); }
+ inline AES_RETURN key192(const unsigned char key[])
+ { return aes_decrypt_key192(key, cx); }
#endif
#if defined(AES_256)
- AES_RETURN key256(const unsigned char key[])
- { return aes_decrypt_key256(key, cx); }
+ inline AES_RETURN key256(const unsigned char key[])
+ { return aes_decrypt_key256(key, cx); }
#endif
#if defined(AES_VAR)
- AES_RETURN key(const unsigned char key[], int key_len)
- { return aes_decrypt_key(key, key_len, cx); }
+ inline AES_RETURN key(const unsigned char key[], int key_len)
+ { return aes_decrypt_key(key, key_len, cx); }
#endif
- AES_RETURN decrypt(const unsigned char in[], unsigned char out[]) const
- { return aes_decrypt(in, out, cx); }
+ inline AES_RETURN decrypt(const unsigned char in[], unsigned char out[]) const
+ { return aes_decrypt(in, out, cx); }
#ifndef AES_MODES
- AES_RETURN ecb_decrypt(const unsigned char in[], unsigned char out[], int nb) const
- { while(nb--)
- { aes_decrypt(in, out, cx), in += AES_BLOCK_SIZE, out += AES_BLOCK_SIZE; }
- }
+ inline AES_RETURN ecb_decrypt(const unsigned char in[], unsigned char out[], int nb) const
+ { while(nb--)
+ { aes_decrypt(in, out, cx), in += AES_BLOCK_SIZE, out += AES_BLOCK_SIZE; }
+ }
#endif
#ifdef AES_MODES
- AES_RETURN ecb_decrypt(const unsigned char in[], unsigned char out[], int nb) const
- { return aes_ecb_decrypt(in, out, nb, cx); }
+ inline AES_RETURN ecb_decrypt(const unsigned char in[], unsigned char out[], int nb) const
+ { return aes_ecb_decrypt(in, out, nb, cx); }
- AES_RETURN cbc_decrypt(const unsigned char in[], unsigned char out[], int nb,
- unsigned char iv[]) const
- { return aes_cbc_decrypt(in, out, nb, iv, cx); }
+ inline AES_RETURN cbc_decrypt(const unsigned char in[], unsigned char out[], int nb,
+ unsigned char iv[]) const
+ { return aes_cbc_decrypt(in, out, nb, iv, cx); }
#endif
+private:
+ aes_decrypt_ctx cx[1];
};
#endif
diff --git a/src/crypto/yarrow_macros.h b/src/crypto/yarrow_macros.h
index 89400c5..6987f50 100644
--- a/src/crypto/yarrow_macros.h
+++ b/src/crypto/yarrow_macros.h
@@ -4,7 +4,7 @@
/* nettle, low-level cryptographics library
*
- * Copyright (C) 2001 Niels Möller
+ * Copyright (C) 2001 Niels Müler
*
* The nettle library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/dialogs/PasswordGenDlg.cpp b/src/dialogs/PasswordGenDlg.cpp
index 8c4d31b..8332c59 100644
--- a/src/dialogs/PasswordGenDlg.cpp
+++ b/src/dialogs/PasswordGenDlg.cpp
@@ -187,6 +187,14 @@ void CGenPwDialog::OnRadio2StateChanged(bool state){
void CGenPwDialog::OnGeneratePw()
{
+ if(Check_CollectEntropy->isChecked()){
+ if((Check_CollectOncePerSession->isChecked() && !EntropyCollected) || !Check_CollectOncePerSession->isChecked()){
+ CollectEntropyDlg dlg(this);
+ dlg.exec();
+ EntropyCollected=true;
+ }
+ }
+
int length = Spin_Num->value();
QString password;
@@ -407,14 +415,6 @@ QString CGenPwDialog::generatePasswordInternal(int length){
}
}
- if(Check_CollectEntropy->isChecked()){
- if((Check_CollectOncePerSession->isChecked() && !EntropyCollected) || !Check_CollectOncePerSession->isChecked()){
- CollectEntropyDlg dlg(this);
- dlg.exec();
- EntropyCollected=true;
- }
- }
-
QString password(length, '\0');
if (ensureEveryGroup){