mirror of https://github.com/openssl/openssl
more mingw related cleanups.
This commit is contained in:
Ulf Möller
parent
7841edc9c1
commit
66ecdf3bfb
|
|
@ -506,10 +506,8 @@ my %table=(
|
|||
"BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN::::::::::win32",
|
||||
"BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::",
|
||||
|
||||
# Mingw32
|
||||
# (Note: the real CFLAGS for Windows builds are defined by util/mk1mf.pl
|
||||
# and its library files in util/pl/*)
|
||||
"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
|
||||
# MinGW
|
||||
"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-mno-cygwin -lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32::::.dll",
|
||||
|
||||
# UWIN
|
||||
"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
|
||||
|
|
|
|||
|
|
@ -140,10 +140,6 @@
|
|||
#include "apps.h"
|
||||
#undef NON_MAIN
|
||||
|
||||
#ifdef OPENSSL_SYS_WINDOWS
|
||||
# include "bss_file.c"
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
char *name;
|
||||
unsigned long flag;
|
||||
|
|
|
|||
|
|
@ -87,10 +87,6 @@
|
|||
#include <openssl/x509.h>
|
||||
#include <openssl/err.h>
|
||||
|
||||
#ifdef OPENSSL_SYS_WINDOWS
|
||||
#include "../bio/bss_file.c"
|
||||
#endif
|
||||
|
||||
const int num0 = 100; /* number of tests */
|
||||
const int num1 = 50; /* additional tests for some functions */
|
||||
const int num2 = 5; /* number of tests for slow functions */
|
||||
|
|
@ -124,11 +120,6 @@ int test_sqrt(BIO *bp,BN_CTX *ctx);
|
|||
int rand_neg(void);
|
||||
static int results=0;
|
||||
|
||||
#ifdef OPENSSL_NO_STDIO
|
||||
#define APPS_WIN16
|
||||
#include "bss_file.c"
|
||||
#endif
|
||||
|
||||
static unsigned char lst[]="\xC6\x4F\x43\x04\x2A\xEA\xCA\x6E\x58\x36\x80\x5B\xE8\xC9"
|
||||
"\x9B\x04\x5D\x48\x36\xC2\xFD\x16\xC9\x64\xF0";
|
||||
|
||||
|
|
|
|||
|
|
@ -66,9 +66,6 @@
|
|||
#include <openssl/bn.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/err.h>
|
||||
#ifdef OPENSSL_SYS_WINDOWS
|
||||
#include "../bio/bss_file.c"
|
||||
#endif
|
||||
|
||||
#define NUM_BITS (BN_BITS*2)
|
||||
|
||||
|
|
|
|||
|
|
@ -68,9 +68,6 @@
|
|||
|
||||
#include "../e_os.h"
|
||||
|
||||
#ifdef OPENSSL_SYS_WINDOWS
|
||||
#include "../bio/bss_file.c"
|
||||
#endif
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/bn.h>
|
||||
|
|
@ -93,10 +90,6 @@ int main(int argc, char *argv[])
|
|||
#endif
|
||||
|
||||
static void MS_CALLBACK cb(int p, int n, void *arg);
|
||||
#ifdef OPENSSL_NO_STDIO
|
||||
#define APPS_WIN16
|
||||
#include "bss_file.c"
|
||||
#endif
|
||||
|
||||
static const char rnd_seed[] = "string to make the random number generator think it has entropy";
|
||||
|
||||
|
|
|
|||
|
|
@ -77,9 +77,6 @@
|
|||
#ifndef OPENSSL_NO_ENGINE
|
||||
#include <openssl/engine.h>
|
||||
#endif
|
||||
#ifdef OPENSSL_SYS_WINDOWS
|
||||
#include "../bio/bss_file.c"
|
||||
#endif
|
||||
|
||||
#ifdef OPENSSL_NO_DSA
|
||||
int main(int argc, char *argv[])
|
||||
|
|
|
|||
|
|
@ -86,11 +86,6 @@
|
|||
#include <openssl/err.h>
|
||||
#include <openssl/rand.h>
|
||||
|
||||
#ifdef OPENSSL_NO_FP_API
|
||||
#define APPS_WIN16
|
||||
#include "../buffer/bss_file.c"
|
||||
#endif
|
||||
|
||||
#define TEST_SERVER_CERT "../../apps/server.pem"
|
||||
#define TEST_CLIENT_CERT "../../apps/client.pem"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
@rem OpenSSL with Mingw32+GNU as
|
||||
@rem ---------------------------
|
||||
|
||||
perl Configure Mingw32 %1 %2 %3 %4 %5 %6 %7 %8
|
||||
perl Configure mingw %1 %2 %3 %4 %5 %6 %7 %8
|
||||
|
||||
@echo off
|
||||
|
||||
|
|
|
|||
|
|
@ -4,17 +4,12 @@
|
|||
@rem Makefile
|
||||
perl util\mkfiles.pl >MINFO
|
||||
perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
|
||||
perl util\mk1mf.pl Mingw32-files >ms\mingw32f.mak
|
||||
@rem DLL definition files
|
||||
perl util\mkdef.pl 32 libeay >ms\libeay32.def
|
||||
if errorlevel 1 goto end
|
||||
perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
|
||||
if errorlevel 1 goto end
|
||||
|
||||
@rem Create files -- this can be skipped if using the GNU file utilities
|
||||
make -f ms/mingw32f.mak
|
||||
echo You can ignore the error messages above
|
||||
|
||||
@rem Build the libraries
|
||||
make -f ms/mingw32.mak
|
||||
if errorlevel 1 goto end
|
||||
|
|
|
|||
|
|
@ -147,7 +147,6 @@
|
|||
|
||||
#ifdef OPENSSL_SYS_WINDOWS
|
||||
#include <winsock.h>
|
||||
#include "../crypto/bio/bss_file.c"
|
||||
#else
|
||||
#include OPENSSL_UNISTD
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue