Commit c063f2c5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Various Win32 related fixed. Make no-krb5 work in mkdef.pl . 

Fix warning in apps/engine.c

Remove definitions of deleted functions.

Add missing definition of X509_VAL.
parent c47c6196

apps/engine.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int append_buf(char **buf, char *s, int *size, int step) 
	if (**buf != '\0')

		l += 2;		/* ", " */



	if (strlen(*buf) + strlen(s) >= *size)

	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)

		{

		*size += step;

		*buf = OPENSSL_realloc(*buf, *size);

crypto/asn1/x_val.c

+2 −0
Original line number Diff line number Diff line
@@ -65,3 +65,5 @@ ASN1_SEQUENCE(X509_VAL) = { 
	ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),

	ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)

} ASN1_SEQUENCE_END(X509_VAL);



IMPLEMENT_ASN1_FUNCTIONS(X509_VAL)

crypto/rijndael/rd_fst.h

+0 −5
Original line number Diff line number Diff line
@@ -39,9 +39,4 @@ int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBit 
void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]);

void rijndaelDecrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 ct[16], u8 pt[16]);



#ifdef INTERMEDIATE_VALUE_KAT

void rijndaelEncryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);

void rijndaelDecryptRound(const u32 rk[/*4*(Nr + 1)*/], int Nr, u8 block[16], int rounds);

#endif /* INTERMEDIATE_VALUE_KAT */



#endif /* __RIJNDAEL_ALG_FST_H */

crypto/rsa/rsa.h

+0 −6
Original line number Diff line number Diff line
@@ -214,9 +214,6 @@ int RSA_set_method(RSA *rsa, struct engine_st *engine); 
/* This function needs the memory locking malloc callbacks to be installed */

int RSA_memory_lock(RSA *r);



/* If you have RSAref compiled in. */

const RSA_METHOD *RSA_PKCS1_RSAref(void);



/* these are the actual SSLeay RSA functions */

const RSA_METHOD *RSA_PKCS1_SSLeay(void);
@@ -240,9 +237,6 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length, int (*cb)(), in 


int i2d_Netscape_RSA(const RSA *a, unsigned char **pp, int (*cb)());

RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, int (*cb)());

/* Naughty internal function required elsewhere, to handle a MS structure

 * that is the same as the netscape one :-) */

RSA *d2i_Netscape_RSA_2(RSA **a, const unsigned char **pp, long length, int (*cb)());



/* The following 2 functions sign and verify a X509_SIG ASN1 object

 * inside PKCS#1 padded RSA encryption */

util/mkdef.pl

+5 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ close(IN); 
my $no_rc2; my $no_rc4; my $no_rc5; my $no_idea; my $no_des; my $no_bf;

my $no_cast;

my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2;

my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes;

my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;

my $no_fp_api;



foreach (@ARGV, split(/ /, $options))
@@ -150,6 +150,7 @@ foreach (@ARGV, split(/ /, $options)) 
	#elsif (/^no-locking$/)	{ $no_locking=1; }

	elsif (/^no-comp$/)	{ $no_comp=1; }

	elsif (/^no-dso$/)	{ $no_dso=1; }

	elsif (/^no-krb5$/)	{ $no_krb5=1; }

	}
@@ -738,8 +739,8 @@ sub print_test_file 
	foreach $sym (@symbols) {

		(my $s, my $i) = $sym =~ /^(.*?)\\(.*)$/;

		if ($s ne $prev) {

			if (!defined($nums{$sym})) {

				printf STDERR "Warning: $sym does not have a number assigned\n"

			if (!defined($nums{$s})) {

				printf STDERR "Warning: $s does not have a number assigned\n"

						if(!$do_update);

			} else {

				$n=$nums{$s};
@@ -838,6 +839,7 @@ EOF 
			    && (!@a || (!$no_dh || !grep(/^DH$/,@a)))

			    && (!@a || (!$no_hmac || !grep(/^HMAC$/,@a)))

			    && (!@a || (!$no_aes || !grep(/^AES$/,@a)))

			    && (!@a || (!$no_krb5 || !grep(/^KRB5$/,@a)))

			    && (!@a || (!$no_fp_api || !grep(/^FP_API$/,@a)))

			    ) {

				if($v) {