1 diff -uarp openssl-0.9.8k.orig/apps/progs.h openssl-0.9.8k/apps/progs.h 2 --- openssl-0.9.8k.orig/apps/progs.h 2008-04-03 16:03:41.000000000 -0700 3 +++ openssl-0.9.8k/apps/progs.h 2009-09-29 18:07:01.000000000 -0700 4 @@ -22,7 +22,9 @@ extern int ecparam_main(int argc,char *a 5 extern int x509_main(int argc,char *argv[]); 6 extern int genrsa_main(int argc,char *argv[]); 7 extern int gendsa_main(int argc,char *argv[]); 8 +#if 0 /* ANDROID */ 9 extern int s_server_main(int argc,char *argv[]); 10 +#endif 11 extern int s_client_main(int argc,char *argv[]); 12 extern int speed_main(int argc,char *argv[]); 13 extern int s_time_main(int argc,char *argv[]); 14 @@ -39,7 +41,9 @@ extern int spkac_main(int argc,char *arg 15 extern int smime_main(int argc,char *argv[]); 16 extern int rand_main(int argc,char *argv[]); 17 extern int engine_main(int argc,char *argv[]); 18 +#ifndef OPENSSL_NO_OCSP 19 extern int ocsp_main(int argc,char *argv[]); 20 +#endif 21 extern int prime_main(int argc,char *argv[]); 22 23 #define FUNC_TYPE_GENERAL 1 24 @@ -97,7 +101,9 @@ FUNCTION functions[] = { 25 {FUNC_TYPE_GENERAL,"gendsa",gendsa_main}, 26 #endif 27 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) 28 - {FUNC_TYPE_GENERAL,"s_server",s_server_main}, 29 +#if 0 /* ANDROID */ 30 + {FUNC_TYPE_GENERAL,"s_server",s_server_main}, 31 +#endif 32 #endif 33 #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) 34 {FUNC_TYPE_GENERAL,"s_client",s_client_main}, 35 @@ -129,7 +135,9 @@ FUNCTION functions[] = { 36 #ifndef OPENSSL_NO_ENGINE 37 {FUNC_TYPE_GENERAL,"engine",engine_main}, 38 #endif 39 +#ifndef OPENSSL_NO_OCSP 40 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, 41 +#endif 42 {FUNC_TYPE_GENERAL,"prime",prime_main}, 43 #ifndef OPENSSL_NO_MD2 44 {FUNC_TYPE_MD,"md2",dgst_main}, 45 diff -uarp openssl-0.9.8k.orig/apps/speed.c openssl-0.9.8k/apps/speed.c 46 --- openssl-0.9.8k.orig/apps/speed.c 2009-01-07 02:48:22.000000000 -0800 47 +++ openssl-0.9.8k/apps/speed.c 2009-09-29 18:06:38.000000000 -0700 48 @@ -108,12 +108,12 @@ 49 #include <signal.h> 50 #endif 51 52 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX) 53 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX) || defined(HAVE_ANDROID_OS) 54 # define USE_TOD 55 #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) 56 # define TIMES 57 #endif 58 -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */ 59 +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(HAVE_ANDROID_OS) /* FIXME */ 60 # define TIMEB 61 #endif 62 63 @@ -1836,6 +1836,7 @@ int MAIN(int argc, char **argv) 64 } 65 } 66 67 +#if 0 /* ANDROID */ 68 if (doit[D_IGE_128_AES]) 69 { 70 for (j=0; j<SIZE_NUM; j++) 71 @@ -1879,6 +1880,7 @@ int MAIN(int argc, char **argv) 72 } 73 } 74 #endif 75 +#endif 76 #ifndef OPENSSL_NO_CAMELLIA 77 if (doit[D_CBC_128_CML]) 78 { 79
