diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/crypto/CipherBlowfish.h | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
Diffstat (limited to 'lib/crypto/CipherBlowfish.h')
| -rw-r--r-- | lib/crypto/CipherBlowfish.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/crypto/CipherBlowfish.h b/lib/crypto/CipherBlowfish.h index b3bcf028..27903a3e 100644 --- a/lib/crypto/CipherBlowfish.h +++ b/lib/crypto/CipherBlowfish.h @@ -38,6 +38,18 @@ public: // Setup any other parameters virtual void SetupParameters(EVP_CIPHER_CTX *pCipherContext) const; +<<<<<<< HEAD +======= + virtual std::string GetCipherName() const + { + std::ostringstream out; + out << "AES"; + out << mKeyLength; + return out.str(); + } + virtual CipherMode GetCipherMode() const { return mMode; } + +>>>>>>> 0.12 #ifdef HAVE_OLD_SSL CipherDescription *Clone() const; void SetIV(const void *pIV); |