diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/crypto/CipherBlowfish.h | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/crypto/CipherBlowfish.h')
| -rw-r--r-- | lib/crypto/CipherBlowfish.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/crypto/CipherBlowfish.h b/lib/crypto/CipherBlowfish.h index 27903a3e..152a265c 100644 --- a/lib/crypto/CipherBlowfish.h +++ b/lib/crypto/CipherBlowfish.h @@ -38,8 +38,6 @@ public: // Setup any other parameters virtual void SetupParameters(EVP_CIPHER_CTX *pCipherContext) const; -<<<<<<< HEAD -======= virtual std::string GetCipherName() const { std::ostringstream out; @@ -49,7 +47,6 @@ public: } virtual CipherMode GetCipherMode() const { return mMode; } ->>>>>>> 0.12 #ifdef HAVE_OLD_SSL CipherDescription *Clone() const; void SetIV(const void *pIV); |