Ack, I'll be glad to be rid of some of this cruft. Adriaan
> -----Original Message----- > From: Alon Bar-Lev [mailto:alon.bar...@gmail.com] > Sent: dinsdag 21 februari 2012 2:22 > To: openvpn-devel@lists.sourceforge.net > Cc: Alon Bar-Lev > Subject: [Openvpn-devel] [PATCH 02/35] cleanup: crypto_openssl.c: > remove support for pre-openssl-0.9.6 > > autoconf rejecting this anyway: > --- > AC_MSG_CHECKING([that OpenSSL Library is at least version 0.9.6]) > <snip> AC_MSG_ERROR([OpenSSL crypto Library is too old.]) > --- > > Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> > --- > crypto_openssl.c | 49 ---------------------------------------------- > --- > 1 files changed, 0 insertions(+), 49 deletions(-) > > diff --git a/crypto_openssl.c b/crypto_openssl.c index 0a41b39..e5e1122 > 100644 > --- a/crypto_openssl.c > +++ b/crypto_openssl.c > @@ -78,47 +78,6 @@ > > #endif > > -#if SSLEAY_VERSION_NUMBER < 0x00906000 > - > -#undef EVP_CIPHER_mode > -#define EVP_CIPHER_mode(x) 1 > -#define EVP_CIPHER_CTX_mode(x) 1 > -#define EVP_CIPHER_flags(x) 0 > - > -#define EVP_CIPH_CBC_MODE 1 > -#define EVP_CIPH_CFB_MODE 0 > -#define EVP_CIPH_OFB_MODE 0 > -#define EVP_CIPH_VARIABLE_LENGTH 0 > - > -#define OPENSSL_malloc(x) malloc(x) > -#define OPENSSL_free(x) free(x) > - > -static inline int > -EVP_CipherInit_ov (EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, > uint8_t *key, uint8_t *iv, int enc) -{ > - EVP_CipherInit (ctx, type, key, iv, enc); > - return 1; > -} > - > -static inline int > -EVP_CipherUpdate_ov (EVP_CIPHER_CTX *ctx, uint8_t *out, int *outl, > uint8_t *in, int inl) -{ > - EVP_CipherUpdate (ctx, out, outl, in, inl); > - return 1; > -} > - > -static inline bool > -cipher_ok (const char* name) > -{ > - const int i = strlen (name) - 4; > - if (i >= 0) > - return !strcmp (name + i, "-CBC"); > - else > - return false; > -} > - > -#else > - > static inline int > EVP_CipherInit_ov (EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, > uint8_t *key, uint8_t *iv, int enc) { @@ -137,14 +96,6 @@ cipher_ok > (const char* name) > return true; > } > > -#endif > - > -#if SSLEAY_VERSION_NUMBER < 0x0090581f > - > -#undef DES_check_key_parity > -#define DES_check_key_parity(x) 1 > -#endif /* SSLEAY_VERSION_NUMBER < 0x0090581f */ > - > #ifndef EVP_CIPHER_name > #define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e)) > #endif > -- > 1.7.3.4 > > > ----------------------------------------------------------------------- > ------- > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, > MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel
