diff options
| author | Stefan Suhren <suhren.stefan@fh-swf.de> | 2015-09-07 14:21:50 +0200 |
|---|---|---|
| committer | Stefan Suhren <suhren.stefan@fh-swf.de> | 2015-09-07 14:21:50 +0200 |
| commit | 446fa96040485c700e23e2511c4fa6922aa3f7a5 (patch) | |
| tree | 2fb2b95e1c92281e48c9db08dafa942c514465de | |
| parent | 9d10c7b552f2eb314f56ff4944ce7481fe6b2433 (diff) | |
| download | src-446fa96040485c700e23e2511c4fa6922aa3f7a5.tar.gz src-446fa96040485c700e23e2511c4fa6922aa3f7a5.zip | |
Entferne den zweiten unötigen Schlüssel aus HybridCrypt
| -rw-r--r-- | crypt/hybridcrypt.cpp | 14 | ||||
| -rw-r--r-- | crypt/hybridcrypt.h | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/crypt/hybridcrypt.cpp b/crypt/hybridcrypt.cpp index 7376459..66b8b6b 100644 --- a/crypt/hybridcrypt.cpp +++ b/crypt/hybridcrypt.cpp @@ -3,8 +3,7 @@ HybridCrypt::HybridCrypt() { // Initialisiere Nutzerschlüssel mit NULL - privateUserkey = NULL; - publicUserkey = NULL; + userKeypair = NULL; // Lade die menschenlesbaren Fehlerstrings für LibCrypto ERR_load_crypto_strings(); @@ -23,14 +22,9 @@ HybridCrypt::HybridCrypt() HybridCrypt::~HybridCrypt() { // Räume Nutzerschlüssel auf - if (privateUserkey != NULL) + if (userKeypair != NULL) { - EVP_PKEY_free(privateUserkey); - } - - if (publicUserkey != NULL) - { - EVP_PKEY_free(publicUserkey); + EVP_PKEY_free(userKeypair); } // Räume OpenSSL auf @@ -85,7 +79,7 @@ void HybridCrypt::createKeypair() } // Erzeuge den Schlüssel - if (EVP_PKEY_keygen(ctx, &privateUserkey) <= 0) + if (EVP_PKEY_keygen(ctx, &userKeypair) <= 0) { throwOpenSslException(); } diff --git a/crypt/hybridcrypt.h b/crypt/hybridcrypt.h index c3ce4ef..ed691d2 100644 --- a/crypt/hybridcrypt.h +++ b/crypt/hybridcrypt.h @@ -81,8 +81,7 @@ public: void exportPublicUserKey(QString keyfileName); private: - EVP_PKEY *privateUserkey; - EVP_PKEY *publicUserkey; + EVP_PKEY *userKeypair; /** * @brief isCsprngSeeded |