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

Update from 1.0.0-stable.

parent 127186bf

Configure

+5 −4
Original line number Diff line number Diff line
@@ -484,11 +484,11 @@ my %table=( 
# Visual C targets

#

# Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64

"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",

"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o::ml64:win32",

"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",

"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o::ml64:win32",

# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement

# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'

"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",

"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",

# Unified CE target

"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
@@ -918,7 +918,8 @@ if (defined($disabled{"tls1"})) 
	$disabled{"tlsext"} = "forced";

	}



if (defined($disabled{"ec"}))

if (defined($disabled{"ec"}) || defined($disabled{"dsa"})

    || defined($disabled{"dh"}))

	{

	$disabled{"gost"} = "forced";

	}

INSTALL.W32

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


- Netwide Assembler, a.k.a. NASM, available from http://nasm.sourceforge.net/

  is required if you intend to utilize assembler modules. Note that NASM

  is the only supported assembler.

  is now the only supported assembler.



 If you are compiling from a tarball or a CVS snapshot then the Win32 files

 may well be not up to date. This may mean that some "tweaking" is required to
@@ -43,7 +43,7 @@ 


 Firstly you should run Configure:



 > perl Configure VC-WIN32 --prefix=c:/some/openssl/dir

 > perl Configure VC-WIN32 --prefix=c:\some\openssl\dir



 Where the prefix argument specifies where OpenSSL will be installed to.
@@ -56,6 +56,7 @@ 


 - If you don't want to use the assembly language files at all then run:



   > perl Configure VC-WIN32 no-asm --prefix=c:/some/openssl/dir

   > ms\do_ms



 If you get errors about things not having numbers assigned then check the

apps/apps.c

+6 −1
Original line number Diff line number Diff line
@@ -921,11 +921,13 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin, 
				&pkey, NULL, NULL))

			goto end;

		}

#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA)

	else if (format == FORMAT_MSBLOB)

		pkey = b2i_PrivateKey_bio(key);

	else if (format == FORMAT_PVK)

		pkey = b2i_PVK_bio(key, (pem_password_cb *)password_callback,

								&cb_data);

#endif

	else

		{

		BIO_printf(err,"bad input format specified for key file\n");
@@ -989,6 +991,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, 
		{

		pkey=d2i_PUBKEY_bio(key, NULL);

		}

#ifndef OPENSSL_NO_RSA

	else if (format == FORMAT_ASN1RSA)

		{

		RSA *rsa;
@@ -1018,7 +1021,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, 
		else

			pkey = NULL;

		}



#endif

	else if (format == FORMAT_PEM)

		{

		pkey=PEM_read_bio_PUBKEY(key,NULL,
@@ -1028,8 +1031,10 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, 
	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)

		pkey = load_netscape_key(err, key, file, key_descrip, format);

#endif

#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA)

	else if (format == FORMAT_MSBLOB)

		pkey = b2i_PublicKey_bio(key);

#endif

	else

		{

		BIO_printf(err,"bad input format specified for key file\n");

apps/dh.c

+6 −0
Original line number Diff line number Diff line
@@ -349,4 +349,10 @@ end: 
	apps_shutdown();

	OPENSSL_EXIT(ret);

	}

#else /* !OPENSSL_NO_DH */



# if PEDANTIC

static void *dummy=&dummy;

# endif



#endif

apps/dhparam.c

+6 −0
Original line number Diff line number Diff line
@@ -554,4 +554,10 @@ static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb) 
	return 1;

	}



#else /* !OPENSSL_NO_DH */



# if PEDANTIC

static void *dummy=&dummy;

# endif



#endif