diff options
Diffstat (limited to 'lib/crypto/CipherDescription.h')
| -rw-r--r-- | lib/crypto/CipherDescription.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/crypto/CipherDescription.h b/lib/crypto/CipherDescription.h index 15438494..813df2ce 100644 --- a/lib/crypto/CipherDescription.h +++ b/lib/crypto/CipherDescription.h @@ -34,11 +34,7 @@ public: // Return OpenSSL cipher object virtual const EVP_CIPHER *GetCipher() const = 0; -<<<<<<< HEAD - -======= ->>>>>>> 0.12 // Setup any other parameters virtual void SetupParameters(EVP_CIPHER_CTX *pCipherContext) const = 0; @@ -51,8 +47,6 @@ public: Mode_OFB = 3 } CipherMode; -<<<<<<< HEAD -======= virtual std::string GetCipherName() const = 0; virtual CipherMode GetCipherMode() const = 0; virtual std::string GetFullName() const @@ -70,7 +64,6 @@ public: return out.str(); } ->>>>>>> 0.12 #ifdef HAVE_OLD_SSL // For the old version of OpenSSL, we need to be able to store cipher descriptions. virtual CipherDescription *Clone() const = 0; |