Commit 401cd0af authored by Richard Levitte's avatar Richard Levitte
Browse files

Add the mapping of des_random_seed() for 0.9.6 compatibility. 

Make sure DES_cblock is defined at all times (meaning one shouldn't include
openssl/des_old.h directly any more).
parent c7b41e67

crypto/crypto-lib.com

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ - 
	"ofb_enc,str2key,pcbc_enc,qud_cksm,rand_key,"+ -

	"des_enc,fcrypt_b,"+ -

	"fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -

	"ede_cbcm_enc,des_old,read2pwd"

	"ede_cbcm_enc,des_old,des_old2,read2pwd"

$ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"

$ LIB_RC4 = "rc4_skey,rc4_enc"

$ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"

crypto/des/Makefile.ssl

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ 
	qud_cksm.c rand_key.c rpc_enc.c  set_key.c  \

	des_enc.c fcrypt_b.c \

	xcbc_enc.c \

	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c read2pwd.c

	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c \

	read2pwd.c



LIBOBJ= set_key.o  ecb_enc.o  cbc_enc.o \

	ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o  ofb64ede.o \
@@ -42,7 +43,7 @@ LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ 
	ofb_enc.o  str2key.o  pcbc_enc.o qud_cksm.o rand_key.o \

	${DES_ENC} \

	fcrypt.o xcbc_enc.o rpc_enc.o  cbc_cksm.o \

	ede_cbcm_enc.o des_old.o read2pwd.o

	ede_cbcm_enc.o des_old.o des_old2.o read2pwd.o



SRC= $(LIBSRC)

crypto/des/des.h

+4 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ 
#include <openssl/opensslconf.h> /* DES_LONG */

#include <openssl/e_os2.h>	/* OPENSSL_EXTERN */



#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT

# include <openssl/des_old.h>

#endif



#ifdef OPENSSL_BUILD_SHLIBCRYPTO

# undef OPENSSL_EXTERN

# define OPENSSL_EXTERN OPENSSL_EXPORT
@@ -95,6 +91,10 @@ typedef struct DES_ks 
	} ks[16];

    } DES_key_schedule;



#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT

# include <openssl/des_old.h>

#endif



#define DES_KEY_SZ 	(sizeof(DES_cblock))

#define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))

crypto/des/des_old.c

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
 */



#define OPENSSL_DES_LIBDES_COMPATIBILITY

#include <openssl/des_old.h>

#include <openssl/des.h>

#include <openssl/rand.h>

crypto/des/des_old.h

+32 −26
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ 
#error DES is disabled.

#endif



#ifndef HEADER_DES_H

#error You must include des.h, not des_old.h directly.

#endif



#ifdef _KERBEROS_DES_H

#error <openssl/des_old.h> replaces <kerberos/des.h>.

#endif
@@ -128,43 +132,43 @@ typedef struct _ossl_old_des_ks_struct 
#define const_des_cblock const_DES_cblock

#define des_key_schedule DES_key_schedule

#define des_ecb3_encrypt(i,o,k1,k2,k3,e)\

	DES_ecb3_encrypt((i),(o),(&k1),(&k2),(&k3),(e))

	DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e))

#define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\

	DES_ede3_cbc_encrypt((i),(o),(l),(&k1),(&k2),(&k3),(iv),(e))

	DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e))

#define des_ede3_cbcm_encrypt(i,o,l,k1,k2,k3,iv1,iv2,e)\

	DES_ede3_cbcm_encrypt((i),(o),(l),(&k1),(&k2),(&k3),(iv1),(iv2),(e))

	DES_ede3_cbcm_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv1),(iv2),(e))

#define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\

	DES_ede3_cfb64_encrypt((i),(o),(l),(&k1),(&k2),(&k3),(iv),(n),(e))

	DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e))

#define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\

	DES_ede3_ofb64_encrypt((i),(o),(l),(&k1),(&k2),(&k3),(iv),(n))

	DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n))

#define des_options()\

	DES_options()

#define des_cbc_cksum(i,o,l,k,iv)\

	DES_cbc_cksum((i),(o),(l),(&k),(iv))

	DES_cbc_cksum((i),(o),(l),&(k),(iv))

#define des_cbc_encrypt(i,o,l,k,iv,e)\

	DES_cbc_encrypt((i),(o),(l),(&k),(iv),(e))

	DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e))

#define des_ncbc_encrypt(i,o,l,k,iv,e)\

	DES_ncbc_encrypt((i),(o),(l),(&k),(iv),(e))

	DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e))

#define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\

	DES_xcbc_encrypt((i),(o),(l),(&k),(iv),(inw),(outw),(e))

	DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e))

#define des_cfb_encrypt(i,o,n,l,k,iv,e)\

	DES_cfb_encrypt((i),(o),(n),(l),(&k),(iv),(e))

	DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e))

#define des_ecb_encrypt(i,o,k,e)\

	DES_ecb_encrypt((i),(o),(&k),(e))

	DES_ecb_encrypt((i),(o),&(k),(e))

#define des_encrypt1(d,k,e)\

	DES_encrypt1((d),(&k),(e))

	DES_encrypt1((d),&(k),(e))

#define des_encrypt2(d,k,e)\

	DES_encrypt2((d),(&k),(e))

	DES_encrypt2((d),&(k),(e))

#define des_encrypt3(d,k1,k2,k3)\

	DES_encrypt3((d),(&k1),(&k2),(&k3))

	DES_encrypt3((d),&(k1),&(k2),&(k3))

#define des_decrypt3(d,k1,k2,k3)\

	DES_decrypt3((d),(&k1),(&k2),(&k3))

	DES_decrypt3((d),&(k1),&(k2),&(k3))

#define des_xwhite_in2out(k,i,o)\

	DES_xwhite_in2out((k),(i),(o))

#define des_enc_read(f,b,l,k,iv)\

	DES_enc_read((f),(b),(l),(&k),(iv))

	DES_enc_read((f),(b),(l),&(k),(iv))

#define des_enc_write(f,b,l,k,iv)\

	DES_enc_write((f),(b),(l),(&k),(iv))

	DES_enc_write((f),(b),(l),&(k),(iv))

#define des_fcrypt(b,s,r)\

	DES_fcrypt((b),(s),(r))

#define des_crypt(b,s)\
@@ -174,13 +178,13 @@ typedef struct _ossl_old_des_ks_struct 
	DES_crypt((b),(s))

#endif

#define des_ofb_encrypt(i,o,n,l,k,iv)\

	DES_ofb_encrypt((i),(o),(n),(l),(&k),(iv))

	DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))

#define des_pcbc_encrypt(i,o,l,k,iv,e)\

	DES_pcbc_encrypt((i),(o),(l),(&k),(iv),(e))

	DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e))

#define des_quad_cksum(i,o,l,c,s)\

	DES_quad_cksum((i),(o),(l),(c),(s))

#define des_random_seed(k)\

	DES_random_seed((k))

	_ossl_096_des_random_seed((k))

#define des_random_key(r)\

	DES_random_key((r))

#define des_read_password(k,p,v) \
@@ -194,21 +198,21 @@ typedef struct _ossl_old_des_ks_struct 
#define des_is_weak_key(k)\

	DES_is_weak_key((k))

#define des_set_key(k,ks)\

	DES_set_key((k),(&ks))

	DES_set_key((k),&(ks))

#define des_key_sched(k,ks)\

	DES_key_sched((k),(&ks))

	DES_key_sched((k),&(ks))

#define des_set_key_checked(k,ks)\

	DES_set_key_checked((k),(&ks))

	DES_set_key_checked((k),&(ks))

#define des_set_key_unchecked(k,ks)\

	DES_set_key_unchecked((k),(&ks))

	DES_set_key_unchecked((k),&(ks))

#define des_string_to_key(s,k)\

	DES_string_to_key((s),(k))

#define des_string_to_2keys(s,k1,k2)\

	DES_string_to_2keys((s),(k1),(k2))

#define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\

	DES_cfb64_encrypt((i),(o),(l),(&ks),(iv),(n),(e))

	DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e))

#define des_ofb64_encrypt(i,o,l,ks,iv,n)\

	DES_ofb64_encrypt((i),(o),(l),(&ks),(iv),(n))

	DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n))

		



#define des_ecb2_encrypt(i,o,k1,k2,e) \
@@ -387,6 +391,8 @@ void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out, long len 
void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,

	_ossl_old_des_key_schedule schedule, _ossl_old_des_cblock *ivec, int *num);



void _ossl_096_des_random_seed(des_cblock *key);



/* The following definitions provide compatibility with the MIT Kerberos

 * library. The _ossl_old_des_key_schedule structure is not binary compatible. */