CVS kaffe (robilad): removed kaffe's crypto provider
Kaffe CVS <[email protected]>
| Newsgroups | gmane.comp.java.vm.kaffe.general |
|---|---|
| Message-ID | <[email protected]> |
PatchSet 7663 Date: 2008/01/02 23:48:20 Author: robilad Branch: HEAD Tag: (none) Log: removed kaffe's crypto provider 2008-01-02 Dalibor Topic <[email protected]> * test/regression/SecureRandomTest.java: Adapted to work with default crypto provider. * configure.ac: Removed SECURITY_LIBS and checks for security libraries. (AC_CONFIG_FILES) Removed libraries/clib/security/Makefile. * include/Makefile.am, libraries/javalib/vmspecific/Makefile.am: Removed all the purged kaffe security interface files. * libraries/clib/Makefile.am (SUBDIRS): Removed security. * libraries/javalib/vmspecific/org/kaffe/security/provider/SHA.java, libraries/javalib/vmspecific/org/kaffe/security/provider/MD4.java, libraries/javalib/vmspecific/org/kaffe/security/provider/Kaffe.java, libraries/javalib/vmspecific/org/kaffe/security/provider/SHA1PRNG.java, libraries/javalib/vmspecific/org/kaffe/security/provider/MD2.java, libraries/javalib/vmspecific/org/kaffe/security/provider/MD5.java, libraries/javalib/vmspecific/org/kaffe/security/provider/UpdateDigest.java, libraries/clib/security/Kaffe.security, libraries/clib/security/digest.c, libraries/clib/security/.cvsignore, libraries/clib/security/kaffe_md5.c, libraries/clib/security/sha-1.h, libraries/clib/security/kaffe_md5.h, libraries/clib/security/Makefile.in, libraries/clib/security/sha-1.c, libraries/clib/security/Makefile.am: Removed. Members: ChangeLog:1.5165->1.5166 Makefile.in:1.302->1.303 configure:1.621->1.622 configure.ac:1.290->1.291 config/Makefile.in:1.249->1.250 config/config.h.in:1.173->1.174 include/Makefile.am:1.144->1.145 include/Makefile.in:1.313->1.314 kaffe/Makefile.in:1.198->1.199 kaffe/jvmpi/Makefile.in:1.123->1.124 kaffe/kaffe/Makefile.in:1.222->1.223 kaffe/kaffeh/Makefile.in:1.203->1.204 kaffe/kaffevm/Makefile.in:1.273->1.274 kaffe/kaffevm/boehm-gc/Makefile.in:1.86->1.87 kaffe/kaffevm/gcj/Makefile.in:1.178->1.179 kaffe/kaffevm/intrp/Makefile.in:1.187->1.188 kaffe/kaffevm/jit/Makefile.in:1.197->1.198 kaffe/kaffevm/jit3/Makefile.in:1.167->1.168 kaffe/kaffevm/jni/Makefile.in:1.91->1.92 kaffe/kaffevm/kaffe-gc/Makefile.in:1.85->1.86 kaffe/kaffevm/systems/Makefile.in:1.187->1.188 kaffe/kaffevm/systems/beos-native/Makefile.in:1.178->1.179 kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.42->1.43 kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.184->1.185 kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.188->1.189 kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.164->1.165 kaffe/kaffevm/verifier/Makefile.in:1.90->1.91 kaffe/man/Makefile.in:1.185->1.186 kaffe/scripts/Makefile.in:1.229->1.230 kaffe/scripts/bat/Makefile.in:1.178->1.179 kaffe/scripts/compat/Makefile.in:1.206->1.207 kaffe/xprof/Makefile.in:1.153->1.154 libraries/Makefile.in:1.181->1.182 libraries/clib/Makefile.am:1.32->1.33 libraries/clib/Makefile.in:1.203->1.204 libraries/clib/awt/Makefile.in:1.196->1.197 libraries/clib/awt/X/Makefile.in:1.191->1.192 libraries/clib/awt/nano-X/Makefile.in:1.63->1.64 libraries/clib/awt/qt/Makefile.in:1.144->1.145 libraries/clib/awt/xynth/Makefile.in:1.19->1.20 libraries/clib/math/Makefile.in:1.194->1.195 libraries/clib/security/.cvsignore:1.1->1.2(DEAD) libraries/clib/security/Kaffe.security:1.4->1.5(DEAD) libraries/clib/security/Makefile.am:1.21->1.22(DEAD) libraries/clib/security/Makefile.in:1.166->1.167(DEAD) libraries/clib/security/digest.c:1.11->1.12(DEAD) libraries/clib/security/kaffe_md5.c:1.3->1.4(DEAD) libraries/clib/security/kaffe_md5.h:1.3->1.4(DEAD) libraries/clib/security/sha-1.c:1.2->1.3(DEAD) libraries/clib/security/sha-1.h:1.3->1.4(DEAD) libraries/clib/zip/Makefile.in:1.199->1.200 libraries/javalib/Makefile.in:1.593->1.594 libraries/javalib/awt-implementations/Makefile.in:1.75->1.76 libraries/javalib/awt-implementations/kaffe/Makefile.in:1.95->1.96 libraries/javalib/gmp-math/Makefile.in:1.84->1.85 libraries/javalib/vmspecific/Makefile.am:1.14->1.15 libraries/javalib/vmspecific/Makefile.in:1.27->1.28 libraries/javalib/vmspecific/org/kaffe/security/provider/Kaffe.java:1.1->1.2(DEAD) libraries/javalib/vmspecific/org/kaffe/security/provider/MD2.java:1.1->1.2(DEAD) libraries/javalib/vmspecific/org/kaffe/security/provider/MD4.java:1.1->1.2(DEAD) libraries/javalib/vmspecific/org/kaffe/security/provider/MD5.java:1.1->1.2(DEAD) libraries/javalib/vmspecific/org/kaffe/security/provider/SHA.java:1.1->1.2(DEAD) libraries/javalib/vmspecific/org/kaffe/security/provider/SHA1PRNG.java:1.2->1.3(DEAD) libraries/javalib/vmspecific/org/kaffe/security/provider/UpdateDigest.java:1.1->1.2(DEAD) libraries/javalib/zlib-zip/Makefile.in:1.21->1.22 replace/Makefile.in:1.141->1.142 test/Makefile.in:1.190->1.191 test/internal/Makefile.in:1.166->1.167 test/jni/Makefile.in:1.96->1.97 test/regression/Makefile.in:1.269->1.270 test/regression/SecureRandomTest.java:1.4->1.5 test/regression/compile_time/Makefile.in:1.118->1.119 test/regression/compiler/Makefile.in:1.102->1.103 test/regression/run_time/Makefile.in:1.117->1.118 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5165 kaffe/ChangeLog:1.5166 --- kaffe/ChangeLog:1.5165 Wed Jan 2 22:28:47 2008 +++ kaffe/ChangeLog Wed Jan 2 23:48:20 2008 @@ -1,5 +1,35 @@ 2008-01-02 Dalibor Topic <[email protected]> + * test/regression/SecureRandomTest.java: Adapted to work with default + crypto provider. + + * configure.ac: Removed SECURITY_LIBS and checks for security libraries. + (AC_CONFIG_FILES) Removed libraries/clib/security/Makefile. + + * include/Makefile.am, libraries/javalib/vmspecific/Makefile.am: + Removed all the purged kaffe security interface files. + + * libraries/clib/Makefile.am (SUBDIRS): Removed security. + + * libraries/javalib/vmspecific/org/kaffe/security/provider/SHA.java, + libraries/javalib/vmspecific/org/kaffe/security/provider/MD4.java, + libraries/javalib/vmspecific/org/kaffe/security/provider/Kaffe.java, + libraries/javalib/vmspecific/org/kaffe/security/provider/SHA1PRNG.java, + libraries/javalib/vmspecific/org/kaffe/security/provider/MD2.java, + libraries/javalib/vmspecific/org/kaffe/security/provider/MD5.java, + libraries/javalib/vmspecific/org/kaffe/security/provider/UpdateDigest.java, + libraries/clib/security/Kaffe.security, + libraries/clib/security/digest.c, + libraries/clib/security/.cvsignore, + libraries/clib/security/kaffe_md5.c, + libraries/clib/security/sha-1.h, + libraries/clib/security/kaffe_md5.h, + libraries/clib/security/Makefile.in, + libraries/clib/security/sha-1.c, + libraries/clib/security/Makefile.am: Removed. + +2008-01-02 Dalibor Topic <[email protected]> + * libraries/javalib/vmspecific/org/kaffe/management/XProfiler.java, libraries/javalib/vmspecific/org/kaffe/management/JIT.java, libraries/javalib/vmspecific/org/kaffe/management/Debug.java, @@ -12,10 +42,10 @@ libraries/clib/management/Makefile.in, libraries/clib/management/Makefile.am: Removed. + * Makefile.am (KAFFELIBRARYPATH): Removed libraries/clib/management. + * include/Makefile.am, libraries/javalib/vmspecific/Makefile.am: Removed all the purged kaffe management interface files. - - * Makefile.am (KAFFELIBRARYPATH): Removed libraries/clib/management. * configure.ac (JAVA_LIBS): Removed libmanagement. (AC_CONFIG_FILES) Removed libraries/clib/management/Makefile. Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.302 kaffe/Makefile.in:1.303 --- kaffe/Makefile.in:1.302 Wed Jan 2 22:28:48 2008 +++ kaffe/Makefile.in Wed Jan 2 23:48:21 2008 @@ -223,7 +223,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -299,7 +298,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ Index: kaffe/configure diff -u kaffe/configure:1.621 kaffe/configure:1.622 --- kaffe/configure:1.621 Wed Jan 2 22:28:48 2008 +++ kaffe/configure Wed Jan 2 23:48:21 2008 @@ -793,8 +793,8 @@ # include <unistd.h> #endif" -ac_func_list= ac_header_list= +ac_func_list= ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME @@ -976,7 +976,6 @@ ZIP_LIBS LIBADD_GMP USE_GMP -SECURITY_LIBS GC_NAME HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE @@ -1029,7 +1028,6 @@ jrebindir jrelibdir nativedir -securitydir PATHSEP DIRSEP kaffe_TRANSF @@ -2141,9 +2139,6 @@ >$cache_file fi -ac_func_list="$ac_func_list MD2Init" -ac_func_list="$ac_func_list MD4Init" -ac_func_list="$ac_func_list MD5Init" ac_header_list="$ac_header_list stdarg.h" ac_header_list="$ac_header_list alloca.h" ac_header_list="$ac_header_list bsd/libc.h" @@ -7092,7 +7087,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7095 "configure"' > conftest.$ac_ext + echo '#line 7090 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9656,11 +9651,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9654: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9663: \$? = $ac_status" >&5 + echo "$as_me:9658: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9946,11 +9941,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9949: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9953: \$? = $ac_status" >&5 + echo "$as_me:9948: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10050,11 +10045,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10053: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10048: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10057: \$? = $ac_status" >&5 + echo "$as_me:10052: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12412,7 +12407,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12415 "configure" +#line 12410 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12512,7 +12507,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12515 "configure" +#line 12510 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14936,11 +14931,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14939: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14934: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14943: \$? = $ac_status" >&5 + echo "$as_me:14938: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15040,11 +15035,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15043: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15038: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15047: \$? = $ac_status" >&5 + echo "$as_me:15042: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16617,11 +16612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16620: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16615: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16624: \$? = $ac_status" >&5 + echo "$as_me:16619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16721,11 +16716,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16719: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16728: \$? = $ac_status" >&5 + echo "$as_me:16723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18925,11 +18920,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18928: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18923: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18932: \$? = $ac_status" >&5 + echo "$as_me:18927: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19215,11 +19210,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19218: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19213: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19222: \$? = $ac_status" >&5 + echo "$as_me:19217: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19319,11 +19314,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19322: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19317: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19326: \$? = $ac_status" >&5 + echo "$as_me:19321: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25638,7 +25633,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 25641 "configure" */ +/* #line 25636 "configure" */ public class Test { } EOF @@ -29743,200 +29738,6 @@ - - -for ac_func in $ac_func_list -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - - - - - - - - - - - - - - - -if test $ac_cv_func_MD5Init = no; then - KSAVE_LIBS="$LIBS" -LIBS="$SECURITY_LIBS $KSAVE_LIBS" - -{ echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5 -echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6; } -if test "${ac_cv_lib_md_MD5Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MD5Init (); -int -main () -{ -return MD5Init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_md_MD5Init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_md_MD5Init=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5 -echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6; } -if test $ac_cv_lib_md_MD5Init = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBMD 1 -_ACEOF - - LIBS="-lmd $LIBS" - -fi - -SECURITY_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"` -LIBS="$KSAVE_LIBS" - -fi -SECURITY_LIBS="$CTLIBS $SECURITY_LIBS" - - - - { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then @@ -31407,6 +31208,103 @@ +for ac_func in $ac_func_list +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + @@ -43568,11 +43466,6 @@ -JAVA_LIBS=" \ -\$(top_builddir)/libraries/clib/security/libsecurity.la \ -$JAVA_LIBS \ -" - if test x"$enable_zlib_zip" != x"no"; then JAVA_LIBS="\$(top_builddir)/libraries/clib/zip/libzip.la $JAVA_LIBS"; fi @@ -44030,9 +43923,6 @@ nativedir=$jredir/lib/$Khost_cpu -securitydir=$jredir/lib/security - - # Check whether --with-jni_library_path was given. @@ -44427,8 +44317,6 @@ ac_config_files="$ac_config_files libraries/clib/math/Makefile" -ac_config_files="$ac_config_files libraries/clib/security/Makefile" - ac_config_files="$ac_config_files libraries/clib/awt/Makefile" ac_config_files="$ac_config_files libraries/clib/awt/X/Makefile" @@ -45323,7 +45211,6 @@ "libraries/clib/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/Makefile" ;; "libraries/clib/zip/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/zip/Makefile" ;; "libraries/clib/math/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/math/Makefile" ;; - "libraries/clib/security/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/security/Makefile" ;; "libraries/clib/awt/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/Makefile" ;; "libraries/clib/awt/X/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/X/Makefile" ;; "libraries/clib/awt/qt/Makefile") CONFIG_FILES="$CONFIG_FILES libraries/clib/awt/qt/Makefile" ;; @@ -45712,7 +45599,6 @@ cat >conf$$subs.sed <<_ACEOF LIBADD_GMP!$LIBADD_GMP$ac_delim USE_GMP!$USE_GMP$ac_delim -SECURITY_LIBS!$SECURITY_LIBS$ac_delim GC_NAME!$GC_NAME$ac_delim HAVE_GCJ_SUPPORT_TRUE!$HAVE_GCJ_SUPPORT_TRUE$ac_delim HAVE_GCJ_SUPPORT_FALSE!$HAVE_GCJ_SUPPORT_FALSE$ac_delim @@ -45765,7 +45651,6 @@ jrebindir!$jrebindir$ac_delim jrelibdir!$jrelibdir$ac_delim nativedir!$nativedir$ac_delim -securitydir!$securitydir$ac_delim PATHSEP!$PATHSEP$ac_delim DIRSEP!$DIRSEP$ac_delim kaffe_TRANSF!$kaffe_TRANSF$ac_delim @@ -45778,7 +45663,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 Index: kaffe/configure.ac diff -u kaffe/configure.ac:1.290 kaffe/configure.ac:1.291 --- kaffe/configure.ac:1.290 Wed Jan 2 22:28:48 2008 +++ kaffe/configure.ac Wed Jan 2 23:48:21 2008 @@ -902,14 +902,6 @@ m4_LIB_GMP -dnl Check for libraries for security library. -AC_CHECK_FUNCS_ONCE(MD2Init MD4Init MD5Init) -if test $ac_cv_func_MD5Init = no; then - AC_CHECK_LIBRARY(md, MD5Init, SECURITY_LIBS) -fi -SECURITY_LIBS="$CTLIBS $SECURITY_LIBS" -AC_SUBST(SECURITY_LIBS) - dnl ------------------------------------------------------------------------- dnl ========================================================================= @@ -1786,11 +1778,6 @@ AM_WITH_DMALLOC -JAVA_LIBS=" \ -\$(top_builddir)/libraries/clib/security/libsecurity.la \ -$JAVA_LIBS \ -" - if test x"$enable_zlib_zip" != x"no"; then JAVA_LIBS="\$(top_builddir)/libraries/clib/zip/libzip.la $JAVA_LIBS"; fi @@ -1946,9 +1933,6 @@ nativedir=$jredir/lib/$Khost_cpu AC_SUBST(nativedir) -securitydir=$jredir/lib/security -AC_SUBST(securitydir) - dnl ========================================================================= dnl Additional directories for jni library path dnl ------------------------------------------------------------------------- @@ -2064,7 +2048,6 @@ AC_CONFIG_FILES([libraries/clib/Makefile]) AC_CONFIG_FILES([libraries/clib/zip/Makefile]) AC_CONFIG_FILES([libraries/clib/math/Makefile]) -AC_CONFIG_FILES([libraries/clib/security/Makefile]) AC_CONFIG_FILES([libraries/clib/awt/Makefile]) AC_CONFIG_FILES([libraries/clib/awt/X/Makefile]) AC_CONFIG_FILES([libraries/clib/awt/qt/Makefile]) Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.249 kaffe/config/Makefile.in:1.250 --- kaffe/config/Makefile.in:1.249 Wed Jan 2 21:50:28 2008 +++ kaffe/config/Makefile.in Wed Jan 2 23:48:23 2008 @@ -197,7 +197,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -273,7 +272,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ Index: kaffe/config/config.h.in diff -u kaffe/config/config.h.in:1.173 kaffe/config/config.h.in:1.174 --- kaffe/config/config.h.in:1.173 Wed Jan 2 21:50:29 2008 +++ kaffe/config/config.h.in Wed Jan 2 23:48:24 2008 @@ -258,9 +258,6 @@ /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM -/* Define to 1 if you have the `md' library (-lmd). */ -#undef HAVE_LIBMD - /* Define to 1 if you have the `mw' library (-lmw). */ #undef HAVE_LIBMW @@ -308,15 +305,6 @@ /* Define to 1 if you have the `mallopt' function. */ #undef HAVE_MALLOPT - -/* Define to 1 if you have the `MD2Init' function. */ -#undef HAVE_MD2INIT - -/* Define to 1 if you have the `MD4Init' function. */ -#undef HAVE_MD4INIT - -/* Define to 1 if you have the `MD5Init' function. */ -#undef HAVE_MD5INIT /* Define to 1 if you have the `memalign' function. */ #undef HAVE_MEMALIGN Index: kaffe/include/Makefile.am diff -u kaffe/include/Makefile.am:1.144 kaffe/include/Makefile.am:1.145 --- kaffe/include/Makefile.am:1.144 Wed Jan 2 22:28:51 2008 +++ kaffe/include/Makefile.am Wed Jan 2 23:48:24 2008 @@ -73,11 +73,7 @@ gnu_java_nio_SelectorImpl.h \ java_lang_VMSystem.h \ java_nio_VMDirectByteBuffer.h \ - java_nio_MappedByteBufferImpl.h \ - org_kaffe_security_provider_MD2.h \ - org_kaffe_security_provider_MD4.h \ - org_kaffe_security_provider_MD5.h \ - org_kaffe_security_provider_SHA.h + java_nio_MappedByteBufferImpl.h JNI_DERIVED_HDRS = \ $(INSTALL_JNI_DERIVED_HDRS) \ Index: kaffe/include/Makefile.in diff -u kaffe/include/Makefile.in:1.313 kaffe/include/Makefile.in:1.314 --- kaffe/include/Makefile.in:1.313 Wed Jan 2 22:28:51 2008 +++ kaffe/include/Makefile.in Wed Jan 2 23:48:25 2008 @@ -212,7 +212,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -288,7 +287,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ @@ -355,11 +353,7 @@ gnu_java_nio_SelectorImpl.h \ java_lang_VMSystem.h \ java_nio_VMDirectByteBuffer.h \ - java_nio_MappedByteBufferImpl.h \ - org_kaffe_security_provider_MD2.h \ - org_kaffe_security_provider_MD4.h \ - org_kaffe_security_provider_MD5.h \ - org_kaffe_security_provider_SHA.h + java_nio_MappedByteBufferImpl.h JNI_DERIVED_HDRS = \ $(INSTALL_JNI_DERIVED_HDRS) \ Index: kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/Makefile.in:1.198 kaffe/kaffe/Makefile.in:1.199 --- kaffe/kaffe/Makefile.in:1.198 Wed Jan 2 21:50:30 2008 +++ kaffe/kaffe/Makefile.in Wed Jan 2 23:48:25 2008 @@ -201,7 +201,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -277,7 +276,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ Index: kaffe/kaffe/jvmpi/Makefile.in diff -u kaffe/kaffe/jvmpi/Makefile.in:1.123 kaffe/kaffe/jvmpi/Makefile.in:1.124 --- kaffe/kaffe/jvmpi/Makefile.in:1.123 Wed Jan 2 21:50:30 2008 +++ kaffe/kaffe/jvmpi/Makefile.in Wed Jan 2 23:48:27 2008 @@ -212,7 +212,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -288,7 +287,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ Index: kaffe/kaffe/kaffe/Makefile.in diff -u kaffe/kaffe/kaffe/Makefile.in:1.222 kaffe/kaffe/kaffe/Makefile.in:1.223 --- kaffe/kaffe/kaffe/Makefile.in:1.222 Wed Jan 2 21:50:31 2008 +++ kaffe/kaffe/kaffe/Makefile.in Wed Jan 2 23:48:28 2008 @@ -213,7 +213,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -289,7 +288,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ Index: kaffe/kaffe/kaffeh/Makefile.in diff -u kaffe/kaffe/kaffeh/Makefile.in:1.203 kaffe/kaffe/kaffeh/Makefile.in:1.204 --- kaffe/kaffe/kaffeh/Makefile.in:1.203 Wed Jan 2 21:50:31 2008 +++ kaffe/kaffe/kaffeh/Makefile.in Wed Jan 2 23:48:28 2008 @@ -219,7 +219,6 @@ QT_GUILINK = @QT_GUILINK@ QT_LDADD = @QT_LDADD@ RANLIB = @RANLIB@ -SECURITY_LIBS = @SECURITY_LIBS@ SED = @SED@ SEMAPHORE_LIB = @SEMAPHORE_LIB@ SET_MAKE = @SET_MAKE@ @@ -295,7 +294,6 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ -securitydir = @securitydir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ *** Patch too long, truncated ***