diff options
| author | Richard Levitte <levitte@openssl.org> | 2005-04-11 14:23:38 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2005-04-11 14:23:38 +0000 |
| commit | 279e449452811ec771bb110fbc0d582de95248f7 (patch) | |
| tree | 7302d8d0cc6c9d8c12c58c6d79fdf5c96b07ff6f | |
| parent | 37e25cc6b849ebfd655f31ea0d6f25a8c1df24e1 (diff) | |
| download | openssl-new-OpenSSL-rfc3820-0_9_7-stable.tar.gz | |
Recent changes from 0.9.7-stable.OpenSSL-rfc3820-0_9_7-stable
85 files changed, 194 insertions, 19 deletions
diff --git a/.cvsignore b/.cvsignore index bec4408ffc..b3b865a46d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,6 @@ cctest.a libcrypto.so.* libssl.so.* libcrypto.sha1 +libcrypto.a.sha1 +*.flc +semantic.cache @@ -4,6 +4,14 @@ Changes between 0.9.7f and 0.9.7g [XX xxx XXXX] + *) Fixes for newer kerberos headers. NB: the casts are needed because + the 'length' field is signed on one version and unsigned on another + with no (?) obvious way to tell the difference, without these VC++ + complains. Also the "definition" of FAR (blank) is no longer included + nor is the error ENOMEM. KRB5_PRIVATE has to be set to 1 to pick up + some needed definitions. + [Steve Henson] + *) Undo Cygwin change. [Ulf Möller] @@ -530,14 +530,14 @@ my %table=( "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::", # MinGW -"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:-D_DLL:-mno-cygwin:.dll", +"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", # Cygwin "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", -"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:cygwin-shared:::.dll", +"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:cygwin-shared:-D_WINDLL::.dll", # DJGPP "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::", @@ -94,7 +94,7 @@ $rmd160_obj = asm/rm86-out.o $rc5_obj = asm/r586-out.o $dso_scheme = dlfcn $shared_target= cygwin-shared -$shared_cflag = +$shared_cflag = -D_WINDLL $shared_ldflag = $shared_extension = .dll $ranlib = @@ -3569,7 +3569,7 @@ $rmd160_obj = asm/rm86-out.o $rc5_obj = asm/r586-out.o $dso_scheme = win32 $shared_target= cygwin-shared -$shared_cflag = -D_DLL +$shared_cflag = -D_WINDLL $shared_ldflag = -mno-cygwin $shared_extension = .dll $ranlib = diff --git a/apps/.cvsignore b/apps/.cvsignore index 90083001b4..e639b536a4 100644 --- a/apps/.cvsignore +++ b/apps/.cvsignore @@ -4,3 +4,5 @@ der_chop der_chop.bak CA.pl openssl.sha1 +*.flc +semantic.cache @@ -337,6 +337,9 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in echo "mips-sony-newsos4"; exit 0; ;; + MINGW*) + echo "${MACHINE}-whatever-mingw"; echo 0; + ;; CYGWIN*) case "$RELEASE" in [bB]*|1.0|1.[12].*) diff --git a/crypto/.cvsignore b/crypto/.cvsignore index 6b86a0a8dc..1cf6edd3bc 100644 --- a/crypto/.cvsignore +++ b/crypto/.cvsignore @@ -2,3 +2,5 @@ lib buildinf.h opensslconf.h Makefile.save +*.flc +semantic.cache diff --git a/crypto/aes/.cvsignore b/crypto/aes/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/aes/.cvsignore +++ b/crypto/aes/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/asn1/.cvsignore b/crypto/asn1/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/asn1/.cvsignore +++ b/crypto/asn1/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/bf/.cvsignore b/crypto/bf/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/bf/.cvsignore +++ b/crypto/bf/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/bf/asm/.cvsignore b/crypto/bf/asm/.cvsignore index 3e14af16d0..0a60dba701 100644 --- a/crypto/bf/asm/.cvsignore +++ b/crypto/bf/asm/.cvsignore @@ -1,2 +1,4 @@ bx86unix.cpp bx86-elf.s +*.flc +semantic.cache diff --git a/crypto/bio/.cvsignore b/crypto/bio/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/bio/.cvsignore +++ b/crypto/bio/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/bn/.cvsignore b/crypto/bn/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/bn/.cvsignore +++ b/crypto/bn/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/bn/asm/.cvsignore b/crypto/bn/asm/.cvsignore index 671eb02019..26475028f5 100644 --- a/crypto/bn/asm/.cvsignore +++ b/crypto/bn/asm/.cvsignore @@ -2,3 +2,5 @@ bn86unix.cpp co86unix.cpp bn86-elf.s co86-elf.s +*.flc +semantic.cache diff --git a/crypto/buffer/.cvsignore b/crypto/buffer/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/buffer/.cvsignore +++ b/crypto/buffer/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/cast/.cvsignore b/crypto/cast/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/cast/.cvsignore +++ b/crypto/cast/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/cast/asm/.cvsignore b/crypto/cast/asm/.cvsignore index d6bf08ba1b..322fa86f77 100644 --- a/crypto/cast/asm/.cvsignore +++ b/crypto/cast/asm/.cvsignore @@ -1,2 +1,4 @@ cx86unix.cpp cx86-elf.s +*.flc +semantic.cache diff --git a/crypto/comp/.cvsignore b/crypto/comp/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/comp/.cvsignore +++ b/crypto/comp/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/conf/.cvsignore b/crypto/conf/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/conf/.cvsignore +++ b/crypto/conf/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index b8e700ce52..fef0afb29f 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -480,13 +480,12 @@ const char *CRYPTO_get_lock_name(int type) return(sk_value(app_locks,type-CRYPTO_NUM_LOCKS)); } -#ifdef _DLL -#ifdef OPENSSL_SYS_WIN32 +#if defined(_WIN32) && defined(_WINDLL) /* All we really need to do is remove the 'error' state when a thread * detaches */ -BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) @@ -505,8 +504,6 @@ BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, } #endif -#endif - void OpenSSLDie(const char *file,int line,const char *assertion) { fprintf(stderr, diff --git a/crypto/des/.cvsignore b/crypto/des/.cvsignore index 45c30cc686..e5c5e37b99 100644 --- a/crypto/des/.cvsignore +++ b/crypto/des/.cvsignore @@ -1,3 +1,5 @@ lib Makefile.save des +*.flc +semantic.cache diff --git a/crypto/des/asm/.cvsignore b/crypto/des/asm/.cvsignore index c8436379e4..b92f40163e 100644 --- a/crypto/des/asm/.cvsignore +++ b/crypto/des/asm/.cvsignore @@ -3,3 +3,5 @@ yx86unix.cpp des_enc-sparc.S dx86-elf.s yx86-elf.s +*.flc +semantic.cache diff --git a/crypto/dh/.cvsignore b/crypto/dh/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/dh/.cvsignore +++ b/crypto/dh/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/dsa/.cvsignore b/crypto/dsa/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/dsa/.cvsignore +++ b/crypto/dsa/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/dso/.cvsignore b/crypto/dso/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/dso/.cvsignore +++ b/crypto/dso/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/ec/.cvsignore b/crypto/ec/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/ec/.cvsignore +++ b/crypto/ec/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/engine/.cvsignore b/crypto/engine/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/engine/.cvsignore +++ b/crypto/engine/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/err/.cvsignore b/crypto/err/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/err/.cvsignore +++ b/crypto/err/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/evp/.cvsignore b/crypto/evp/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/evp/.cvsignore +++ b/crypto/evp/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/hmac/.cvsignore b/crypto/hmac/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/hmac/.cvsignore +++ b/crypto/hmac/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/idea/.cvsignore b/crypto/idea/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/idea/.cvsignore +++ b/crypto/idea/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/krb5/.cvsignore b/crypto/krb5/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/krb5/.cvsignore +++ b/crypto/krb5/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/lhash/.cvsignore b/crypto/lhash/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/lhash/.cvsignore +++ b/crypto/lhash/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/md2/.cvsignore b/crypto/md2/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/md2/.cvsignore +++ b/crypto/md2/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/md4/.cvsignore b/crypto/md4/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/md4/.cvsignore +++ b/crypto/md4/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/md5/.cvsignore b/crypto/md5/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/md5/.cvsignore +++ b/crypto/md5/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/md5/asm/.cvsignore b/crypto/md5/asm/.cvsignore index 5dd0091ca7..52659220f2 100644 --- a/crypto/md5/asm/.cvsignore +++ b/crypto/md5/asm/.cvsignore @@ -1,2 +1,4 @@ mx86unix.cpp mx86-elf.s +*.flc +semantic.cache diff --git a/crypto/mdc2/.cvsignore b/crypto/mdc2/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/mdc2/.cvsignore +++ b/crypto/mdc2/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/objects/.cvsignore b/crypto/objects/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/objects/.cvsignore +++ b/crypto/objects/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/ocsp/.cvsignore b/crypto/ocsp/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/ocsp/.cvsignore +++ b/crypto/ocsp/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/pem/.cvsignore b/crypto/pem/.cvsignore index d0340d6553..feb507d7bd 100644 --- a/crypto/pem/.cvsignore +++ b/crypto/pem/.cvsignore @@ -1,3 +1,5 @@ lib ctx_size Makefile.save +*.flc +semantic.cache diff --git a/crypto/pkcs12/.cvsignore b/crypto/pkcs12/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/pkcs12/.cvsignore +++ b/crypto/pkcs12/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/pkcs7/.cvsignore b/crypto/pkcs7/.cvsignore index 780d5c1afc..5463e2ac26 100644 --- a/crypto/pkcs7/.cvsignore +++ b/crypto/pkcs7/.cvsignore @@ -4,3 +4,5 @@ enc dec sign verify +*.flc +semantic.cache diff --git a/crypto/rand/.cvsignore b/crypto/rand/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/rand/.cvsignore +++ b/crypto/rand/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/rc2/.cvsignore b/crypto/rc2/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/rc2/.cvsignore +++ b/crypto/rc2/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/rc4/.cvsignore b/crypto/rc4/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/rc4/.cvsignore +++ b/crypto/rc4/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/rc4/asm/.cvsignore b/crypto/rc4/asm/.cvsignore index b261702507..ded381e2be 100644 --- a/crypto/rc4/asm/.cvsignore +++ b/crypto/rc4/asm/.cvsignore @@ -1,2 +1,4 @@ rx86unix.cpp rx86-elf.s +*.flc +semantic.cache diff --git a/crypto/rc5/.cvsignore b/crypto/rc5/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/rc5/.cvsignore +++ b/crypto/rc5/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/rc5/asm/.cvsignore b/crypto/rc5/asm/.cvsignore index 855415c90e..e294b19f6e 100644 --- a/crypto/rc5/asm/.cvsignore +++ b/crypto/rc5/asm/.cvsignore @@ -1,2 +1,4 @@ r586unix.cpp r586-elf.s +*.flc +semantic.cache diff --git a/crypto/ripemd/.cvsignore b/crypto/ripemd/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/ripemd/.cvsignore +++ b/crypto/ripemd/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/ripemd/asm/.cvsignore b/crypto/ripemd/asm/.cvsignore index e18b24f965..1c4890f54c 100644 --- a/crypto/ripemd/asm/.cvsignore +++ b/crypto/ripemd/asm/.cvsignore @@ -1,2 +1,4 @@ rm86unix.cpp rm86-elf.s +*.flc +semantic.cache diff --git a/crypto/rsa/.cvsignore b/crypto/rsa/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/rsa/.cvsignore +++ b/crypto/rsa/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/sha/.cvsignore b/crypto/sha/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/sha/.cvsignore +++ b/crypto/sha/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/sha/asm/.cvsignore b/crypto/sha/asm/.cvsignore index 748a54a4b5..9921443258 100644 --- a/crypto/sha/asm/.cvsignore +++ b/crypto/sha/asm/.cvsignore @@ -1,2 +1,4 @@ sx86unix.cpp sx86-elf.s +*.flc +semantic.cache diff --git a/crypto/stack/.cvsignore b/crypto/stack/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/stack/.cvsignore +++ b/crypto/stack/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/txt_db/.cvsignore b/crypto/txt_db/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/txt_db/.cvsignore +++ b/crypto/txt_db/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/ui/.cvsignore b/crypto/ui/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/ui/.cvsignore +++ b/crypto/ui/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/x509/.cvsignore b/crypto/x509/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/x509/.cvsignore +++ b/crypto/x509/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/crypto/x509v3/.cvsignore b/crypto/x509v3/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/crypto/x509v3/.cvsignore +++ b/crypto/x509v3/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/demos/easy_tls/.cvsignore b/demos/easy_tls/.cvsignore index 9daeafb986..eae327db85 100644 --- a/demos/easy_tls/.cvsignore +++ b/demos/easy_tls/.cvsignore @@ -1 +1,3 @@ test +*.flc +semantic.cache diff --git a/demos/engines/cluster_labs/.cvsignore b/demos/engines/cluster_labs/.cvsignore index 594223d400..375a79d415 100644 --- a/demos/engines/cluster_labs/.cvsignore +++ b/demos/engines/cluster_labs/.cvsignore @@ -2,3 +2,5 @@ *.so *.so.* *.a +*.flc +semantic.cache diff --git a/demos/engines/ibmca/.cvsignore b/demos/engines/ibmca/.cvsignore index 594223d400..375a79d415 100644 --- a/demos/engines/ibmca/.cvsignore +++ b/demos/engines/ibmca/.cvsignore @@ -2,3 +2,5 @@ *.so *.so.* *.a +*.flc +semantic.cache diff --git a/demos/engines/rsaref/.cvsignore b/demos/engines/rsaref/.cvsignore index 76776d9a59..e8e5e6245a 100644 --- a/demos/engines/rsaref/.cvsignore +++ b/demos/engines/rsaref/.cvsignore @@ -10,3 +10,5 @@ doc install rdemo source +*.flc +semantic.cache diff --git a/demos/engines/zencod/.cvsignore b/demos/engines/zencod/.cvsignore index 594223d400..375a79d415 100644 --- a/demos/engines/zencod/.cvsignore +++ b/demos/engines/zencod/.cvsignore @@ -2,3 +2,5 @@ *.so *.so.* *.a +*.flc +semantic.cache diff --git a/demos/maurice/.cvsignore b/demos/maurice/.cvsignore index a99bec3448..22c4e879ee 100644 --- a/demos/maurice/.cvsignore +++ b/demos/maurice/.cvsignore @@ -2,3 +2,5 @@ example1 example2 example3 example4 +*.flc +semantic.cache diff --git a/demos/state_machine/.cvsignore b/demos/state_machine/.cvsignore index 9aef0f5d4c..a90633f958 100644 --- a/demos/state_machine/.cvsignore +++ b/demos/state_machine/.cvsignore @@ -1 +1,3 @@ state_machine +*.flc +semantic.cache diff --git a/demos/tunala/.cvsignore b/demos/tunala/.cvsignore index 1254a1ee29..f9eca981d2 100644 --- a/demos/tunala/.cvsignore +++ b/demos/tunala/.cvsignore @@ -1,2 +1,4 @@ tunala +*.flc +semantic.cache diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod index daf57e5895..40e525dd56 100644 --- a/doc/crypto/EVP_EncryptInit.pod +++ b/doc/crypto/EVP_EncryptInit.pod @@ -479,6 +479,7 @@ General encryption, decryption function example using FILE I/O and RC2 with an if(!EVP_CipherUpdate(&ctx, outbuf, &outlen, inbuf, inlen)) { /* Error */ + EVP_CIPHER_CTX_cleanup(&ctx); return 0; } fwrite(outbuf, 1, outlen, out); @@ -486,6 +487,7 @@ General encryption, decryption function example using FILE I/O and RC2 with an if(!EVP_CipherFinal_ex(&ctx, outbuf, &outlen)) { /* Error */ + EVP_CIPHER_CTX_cleanup(&ctx); return 0; } fwrite(outbuf, 1, outlen, out); diff --git a/fips/.cvsignore b/fips/.cvsignore index 0ee7b7c45f..a8a81d6394 100644 --- a/fips/.cvsignore +++ b/fips/.cvsignore @@ -2,3 +2,5 @@ lib Makefile.save fips_test_suite fips_test_suite.sha1 +*.flc +semantic.cache diff --git a/fips/aes/.cvsignore b/fips/aes/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/fips/aes/.cvsignore +++ b/fips/aes/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/fips/des/.cvsignore b/fips/des/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/fips/des/.cvsignore +++ b/fips/des/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/fips/dh/.cvsignore b/fips/dh/.cvsignore index a65b41774a..f018d20192 100644 --- a/fips/dh/.cvsignore +++ b/fips/dh/.cvsignore @@ -1 +1,3 @@ lib +*.flc +semantic.cache diff --git a/fips/dsa/.cvsignore b/fips/dsa/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/fips/dsa/.cvsignore +++ b/fips/dsa/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/fips/rand/.cvsignore b/fips/rand/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/fips/rand/.cvsignore +++ b/fips/rand/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/fips/rsa/.cvsignore b/fips/rsa/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/fips/rsa/.cvsignore +++ b/fips/rsa/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/fips/sha1/.cvsignore b/fips/sha1/.cvsignore index 810154e7ed..78ace06571 100644 --- a/fips/sha1/.cvsignore +++ b/fips/sha1/.cvsignore @@ -1,3 +1,5 @@ fips_standalone_sha1 lib Makefile.save +*.flc +semantic.cache diff --git a/include/.cvsignore b/include/.cvsignore index 72e8ffc0db..55e25b4c8c 100644 --- a/include/.cvsignore +++ b/include/.cvsignore @@ -1 +1,3 @@ * +*.flc +semantic.cache diff --git a/ms/.cvsignore b/ms/.cvsignore index 8108335b52..5f8e47bc63 100644 --- a/ms/.cvsignore +++ b/ms/.cvsignore @@ -1,3 +1,5 @@ *.def *.mak *.out +*.flc +semantic.cache diff --git a/perl/.cvsignore b/perl/.cvsignore index e3f4b2ec4e..5e8eb88bf5 100644 --- a/perl/.cvsignore +++ b/perl/.cvsignore @@ -10,3 +10,5 @@ openssl_err.c openssl_ssl.c openssl_x509.c OpenSSL.bs +*.flc +semantic.cache diff --git a/ssl/.cvsignore b/ssl/.cvsignore index c6d03a9dbc..439e6d3eb6 100644 --- a/ssl/.cvsignore +++ b/ssl/.cvsignore @@ -1,2 +1,4 @@ lib Makefile.save +*.flc +semantic.cache diff --git a/ssl/kssl.c b/ssl/kssl.c index 51378897f6..3afa95f3fa 100644 --- a/ssl/kssl.c +++ b/ssl/kssl.c @@ -73,6 +73,8 @@ #undef _XOPEN_SOURCE /* To avoid clashes with anything else... */ #include <string.h> +#define KRB5_PRIVATE 1 + #include <openssl/ssl.h> #include <openssl/evp.h> #include <openssl/objects.h> @@ -80,6 +82,10 @@ #ifndef OPENSSL_NO_KRB5 +#ifndef ENOMEM +#define ENOMEM KRB5KRB_ERR_GENERIC +#endif + /* * When OpenSSL is built on Windows, we do not want to require that * the Kerberos DLLs be available in order for the OpenSSL DLLs to @@ -932,7 +938,7 @@ print_krb5_data(char *label, krb5_data *kdata) int i; printf("%s[%d] ", label, kdata->length); - for (i=0; i < kdata->length; i++) + for (i=0; i < (int)kdata->length; i++) { if (0 && isprint((int) kdata->data[i])) printf( "%c ", kdata->data[i]); @@ -984,14 +990,14 @@ print_krb5_keyblock(char *label, krb5_keyblock *keyblk) #ifdef KRB5_HEIMDAL printf("%s\n\t[et%d:%d]: ", label, keyblk->keytype, keyblk->keyvalue->length); - for (i=0; i < keyblk->keyvalue->length; i++) + for (i=0; i < (int)keyblk->keyvalue->length; i++) { printf("%02x",(unsigned char *)(keyblk->keyvalue->contents)[i]); } printf("\n"); #else printf("%s\n\t[et%d:%d]: ", label, keyblk->enctype, keyblk->length); - for (i=0; i < keyblk->length; i++) + for (i=0; i < (int)keyblk->length; i++) { printf("%02x",keyblk->contents[i]); } @@ -1010,12 +1016,12 @@ print_krb5_princ(char *label, krb5_principal_data *princ) printf("%s principal Realm: ", label); if (princ == NULL) return; - for (ui=0; ui < princ->realm.length; ui++) putchar(princ->realm.data[ui]); + for (ui=0; ui < (int)princ->realm.length; ui++) putchar(princ->realm.data[ui]); printf(" (nametype %d) has %d strings:\n", princ->type,princ->length); - for (i=0; i < princ->length; i++) + for (i=0; i < (int)princ->length; i++) { printf("\t%d [%d]: ", i, princ->data[i].length); - for (uj=0; uj < princ->data[i].length; uj++) { + for (uj=0; uj < (int)princ->data[i].length; uj++) { putchar(princ->data[i].data[uj]); } printf("\n"); diff --git a/ssl/kssl.h b/ssl/kssl.h index 19a689b089..a3d20e1ccb 100644 --- a/ssl/kssl.h +++ b/ssl/kssl.h @@ -82,6 +82,12 @@ extern "C" { #ifdef KRB5_HEIMDAL typedef unsigned char krb5_octet; #define FAR +#else + +#ifndef FAR +#define FAR +#endif + #endif /* Uncomment this to debug kssl problems or diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 5f3aada1d6..c4a1a71523 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1594,7 +1594,7 @@ static int ssl3_get_client_key_exchange(SSL *s) n2s(p,i); enc_ticket.length = i; - if (n < enc_ticket.length + 6) + if (n < (long)enc_ticket.length + 6) { SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DATA_LENGTH_TOO_LONG); @@ -1607,7 +1607,7 @@ static int ssl3_get_client_key_exchange(SSL *s) n2s(p,i); authenticator.length = i; - if (n < enc_ticket.length + authenticator.length + 6) + if (n < (long)(enc_ticket.length + authenticator.length + 6)) { SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DATA_LENGTH_TOO_LONG); @@ -1632,8 +1632,8 @@ static int ssl3_get_client_key_exchange(SSL *s) goto err; } - if (n != enc_ticket.length + authenticator.length + - enc_pms.length + 6) + if (n != (long)(enc_ticket.length + authenticator.length + + enc_pms.length + 6)) { SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DATA_LENGTH_TOO_LONG); diff --git a/test/.cvsignore b/test/.cvsignore index 2dfacad9d9..da80bdbdb7 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -17,3 +17,5 @@ tmp.bntest fips_aesavs fips_desmovs evptests.txt +*.flc +semantic.cache diff --git a/tools/.cvsignore b/tools/.cvsignore index af0e591579..cde7450dfc 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -1,2 +1,4 @@ c_rehash c_rehash.bak +*.flc +semantic.cache |