OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Andy
Polyakov
Root: /v/openssl/cvs Email: appro openssl.org
Module: openssl Date:
23-Oct-2006 09:30:20
Branch: HEAD Handle:
2006102308301801
Modified files:
openssl Configure Makefile.shared
openssl/crypto/engine engine.h
openssl/util libeay.num
Log:
Allow for mingw cross-compile configuration.
Summary:
Revision Changes Path
1.543 +0 -10 openssl/Configure
1.59 +8 -4 openssl/Makefile.shared
1.70 +1 -1 openssl/crypto/engine/engine.h
1.275 +20 -1 openssl/util/libeay.num
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/Configure
============================================================
================
$ cvs diff -u -r1.542 -r1.543 Configure
--- openssl/Configure 21 Oct 2006 13:38:15 -0000 1.542
+++ openssl/Configure 23 Oct 2006 07:30:18 -0000 1.543
-937,8 +937,6
my $IsMK1MF=scalar grep /^$target$/,MK1MF_Builds;
-$IsMK1MF=1 if ($target eq "mingw" &&
$^O ne "cygwin" && !is_msys());
-
$exe_ext=".exe" if ($target eq
"Cygwin" || $target eq "DJGPP" ||
$target eq "mingw");
$exe_ext=".pm" if ($target =~ /vos/);
$openssldir="/usr/local/ssl" if ($openssldir eq
"" and $prefix eq "");
-1847,11 +1845,3
print STDERR "No sanity errors detected!n" if
$errorcnt == 0;
return $errorcnt;
}
-
-# Attempt to detect MSYS environment
-
-sub is_msys
- {
- return 1 if (exists $ENV{"TERM"} &&
$ENV{"TERM"} eq "msys");
- return 0;
- }
.
patch -p0 <<' .'
Index: openssl/Makefile.shared
============================================================
================
$ cvs diff -u -r1.58 -r1.59 Makefile.shared
--- openssl/Makefile.shared 21 Oct 2006 13:38:15
-0000 1.58
+++ openssl/Makefile.shared 23 Oct 2006 07:30:18
-0000 1.59
-249,7 +249,7
$(CALC_VERSIONS);
INHIBIT_SYMLINKS=yes;
SHLIB=cyg$(LIBNAME);
- expr $(PLATFORM) : 'mingw' > /dev/null &&
SHLIB=$(LIBNAME)eay32;
+ expr $(PLATFORM) : 'mingw' > /dev/null &&
SHLIB=$(LIBNAME);
SHLIB_SUFFIX=.dll;
LIBVERSION="$(LIBVERSION)";
SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"};
-260,14 +260,18
link_a.cygwin:
$(CALC_VERSIONS);
INHIBIT_SYMLINKS=yes;
- SHLIB=cyg$(LIBNAME);
- expr $(PLATFORM) : 'mingw' > /dev/null &&
SHLIB=$(LIBNAME)eay32;
+ SHLIB=cyg$(LIBNAME); def=;
+ if expr $(PLATFORM) : 'mingw' > /dev/null; then
+ SHLIB=$(LIBNAME);
+ def="$(LIBNAME).def";
+ $(PERL) util/mkdef.pl 32 $(LIBNAME) > $$def;
+ fi;
SHLIB_SUFFIX=.dll;
SHLIB_SOVER=-$(LIBVERSION);
ALLSYMSFLAGS='-Wl,--whole-archive';
NOALLSYMSFLAGS='-Wl,--no-whole-archive';
base=; [ $(LIBNAME) = "crypto" ] &&
base=-Wl,--image-base,0x63000000;
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
$$base -Wl,-Bsymbolic
-Wl,--out-implib,lib$(LIBNAME).dll.a";
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared
$$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a
$$def";
[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm
apps/$$SHLIB$$SHLIB_SUFFIX;
[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm
test/$$SHLIB$$SHLIB_SUFFIX;
$(LINK_SO_A) || exit 1;
.
patch -p0 <<' .'
Index: openssl/crypto/engine/engine.h
============================================================
================
$ cvs diff -u -r1.69 -r1.70 engine.h
--- openssl/crypto/engine/engine.h 21 Sep 2006 13:24:45
-0000 1.69
+++ openssl/crypto/engine/engine.h 23 Oct 2006 07:30:19
-0000 1.70
-333,10 +333,10
void ENGINE_load_nuron(void);
void ENGINE_load_sureware(void);
void ENGINE_load_ubsec(void);
+void ENGINE_load_gost(void);
#endif
void ENGINE_load_cryptodev(void);
void ENGINE_load_padlock(void);
-void ENGINE_load_gost(void);
void ENGINE_load_builtin_engines(void);
/* Get and set global flags (ENGINE_TABLE_FLAG_***) for
the implementation
.
patch -p0 <<' .'
Index: openssl/util/libeay.num
============================================================
================
$ cvs diff -u -r1.274 -r1.275 libeay.num
--- openssl/util/libeay.num 17 Jul 2006 18:52:51
-0000 1.274
+++ openssl/util/libeay.num 23 Oct 2006 07:30:19
-0000 1.275
-3458,7 +3458,6
ASN1_PCTX_get_cert_flags
3858 EXIST::FUNCTION:
i2d_ESS_SIGNING_CERT
3859 EXIST::FUNCTION:
TS_CONF_load_key
3860 EXIST::FUNCTION:
-d2i_TS_MSG_IMPRINT_bio
3861 EXIST::FUNCTION:
EVP_PKEY_asn1_set_public
3862 EXIST::FUNCTION:
b2i_PublicKey_bio
3863 EXIST::FUNCTION:
TS_REQ_ext_free
3864 EXIST::FUNCTION:
-3775,3 +3774,23
OCSP_REQ_CTX_free
4168 EXIST::FUNCTION:
OCSP_sendreq_nbio
4169 EXIST::FUNCTION:
OCSP_sendreq_new
4170 EXIST::FUNCTION:
+X509_STORE_get1_crls
4171 EXIST::FUNCTION:
+AES_ige_encrypt
4175 EXIST::FUNCTION:AES
+X509_CRL_METHOD_free
4176 EXIST::FUNCTION:
+ENGINE_register_pkey_asn1_meths
4177 EXIST::FUNCTION:ENGINE
+X509_CRL_set_meth_data
4178 EXIST::FUNCTION:
+X509_CRL_match
4179 EXIST::FUNCTION:
+X509_CRL_get_meth_data
4180 EXIST::FUNCTION:
+AES_bi_ige_encrypt
4181 EXIST::FUNCTION:AES
+X509_CRL_METHOD_new
4182 EXIST::FUNCTION:
+ENGINE_register_all_pkey_asn1_meths
4183 EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_reg_all_pkey_asn1_meths
4183 EXIST:VMS:FUNCTION:ENGINE
+X509_CRL_set_default_method
4184 EXIST::FUNCTION:
+X509_CRL_get0_by_serial
4185 EXIST::FUNCTION:
+X509_STORE_get1_certs
4186 EXIST::FUNCTION:
+X509_check_akid
4187 EXIST::FUNCTION:
+ENGINE_unregister_pkey_asn1_meths
4188 EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_unreg_pkey_asn1_meths
4188 EXIST:VMS:FUNCTION:ENGINE
+PKCS5_PBKDF2_HMAC
4189 EXIST::FUNCTION:
+check_defer
4190 EXIST::FUNCTION:
+ENGINE_load_gost
4192 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|