Commit 5fdf0666 authored by Richard Levitte's avatar Richard Levitte
Browse files

Avoid including cryptlib.h, it's not really needed. 

Check if IDEA is being built or not.
This is part of a large change submitted by Markus Friedl <markus@openbsd.org>
parent f28e8bd3

ssl/s2_clnt.c

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
#include <openssl/buffer.h>

#include <openssl/objects.h>

#include <openssl/evp.h>

#include "cryptlib.h"



static SSL_METHOD *ssl2_get_client_method(int ver);

static int get_server_finished(SSL *s);

ssl/s2_enc.c

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include "ssl_locl.h"

#ifndef OPENSSL_NO_SSL2

#include <stdio.h>

#include "cryptlib.h"



int ssl2_enc_init(SSL *s, int client)

	{

ssl/s2_lib.c

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
#include <openssl/objects.h>

#include <openssl/evp.h>

#include <openssl/md5.h>

#include "cryptlib.h"



static long ssl2_default_timeout(void );

const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT;
@@ -139,6 +138,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={ 
	SSL_ALL_STRENGTHS,

	},

/* IDEA_128_CBC_WITH_MD5 */

#ifndef OPENSSL_NO_IDEA

	{

	1,

	SSL2_TXT_IDEA_128_CBC_WITH_MD5,
@@ -151,6 +151,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl2_ciphers[]={ 
	SSL_ALL_CIPHERS,

	SSL_ALL_STRENGTHS,

	},

#endif

/* DES_64_CBC_WITH_MD5 */

	{

	1,

ssl/s2_pkt.c

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ 
#ifndef OPENSSL_NO_SSL2

#include <stdio.h>

#include <errno.h>

#include "cryptlib.h"

#define USE_SOCKETS



static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend);

ssl/s2_srvr.c

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ 
#include <openssl/rand.h>

#include <openssl/objects.h>

#include <openssl/evp.h>

#include "cryptlib.h"



static SSL_METHOD *ssl2_get_server_method(int ver);

static int get_client_master_key(SSL *s);