OLD | NEW |
(Empty) | |
| 1 --- openssl-1.0.0.orig/apps/openssl.c 2009-10-04 09:43:21.000000000 -0700 |
| 2 +++ openssl-1.0.0/apps/openssl.c 2010-05-18 14:05:14.000000000 -0700 |
| 3 @@ -275,8 +275,10 @@ int main(int Argc, char *Argv[]) |
| 4 if (ERR_GET_REASON(ERR_peek_last_error()) |
| 5 == CONF_R_NO_SUCH_FILE) |
| 6 { |
| 7 +#if 0 /* ANDROID */ |
| 8 BIO_printf(bio_err, |
| 9 "WARNING: can't open config file: %s\n",p); |
| 10 +#endif |
| 11 ERR_clear_error(); |
| 12 NCONF_free(config); |
| 13 config = NULL; |
| 14 --- openssl-1.0.0.orig/apps/progs.h 2009-06-30 08:08:38.000000000 -0700 |
| 15 +++ openssl-1.0.0/apps/progs.h 2010-05-18 14:05:38.000000000 -0700 |
| 16 @@ -146,7 +152,9 @@ FUNCTION functions[] = { |
| 17 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, |
| 18 #endif |
| 19 {FUNC_TYPE_GENERAL,"prime",prime_main}, |
| 20 +#if 0 /* ANDROID */ |
| 21 {FUNC_TYPE_GENERAL,"ts",ts_main}, |
| 22 +#endif |
| 23 #ifndef OPENSSL_NO_MD2 |
| 24 {FUNC_TYPE_MD,"md2",dgst_main}, |
| 25 #endif |
| 26 --- openssl-1.0.0.orig/apps/speed.c 2010-03-03 11:56:17.000000000 -0800 |
| 27 +++ openssl-1.0.0/apps/speed.c 2010-05-18 14:05:57.000000000 -0700 |
| 28 @@ -1718,6 +1718,7 @@ int MAIN(int argc, char **argv) |
| 29 } |
| 30 } |
| 31 |
| 32 +#if 0 /* ANDROID */ |
| 33 if (doit[D_IGE_128_AES]) |
| 34 { |
| 35 for (j=0; j<SIZE_NUM; j++) |
| 36 @@ -1763,6 +1764,7 @@ int MAIN(int argc, char **argv) |
| 37 |
| 38 |
| 39 #endif |
| 40 +#endif |
| 41 #ifndef OPENSSL_NO_CAMELLIA |
| 42 if (doit[D_CBC_128_CML]) |
| 43 { |
| 44 --- openssl-1.0.0.orig/crypto/ui/ui_openssl.c 2009-10-04 09:43:21.000000000 -0
700 |
| 45 +++ openssl-1.0.0/crypto/ui/ui_openssl.c 2010-05-18 13:36:26.000000000 -0
700 |
| 46 @@ -184,7 +184,7 @@ |
| 47 # undef SGTTY |
| 48 #endif |
| 49 |
| 50 -#if defined(linux) && !defined(TERMIO) |
| 51 +#if defined(linux) && !defined(TERMIO) && !defined(__ANDROID__) |
| 52 # undef TERMIOS |
| 53 # define TERMIO |
| 54 # undef SGTTY |
OLD | NEW |