You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
10 years ago
|
--- openssl-1.0.0.orig/apps/openssl.c 2009-10-04 09:43:21.000000000 -0700
|
||
|
|
+++ openssl-1.0.0/apps/openssl.c 2010-05-18 14:05:14.000000000 -0700
|
||
|
|
@@ -275,8 +275,10 @@ int main(int Argc, char *Argv[])
|
||
|
|
if (ERR_GET_REASON(ERR_peek_last_error())
|
||
|
|
== CONF_R_NO_SUCH_FILE)
|
||
|
|
{
|
||
|
|
+#if 0 /* ANDROID */
|
||
|
|
BIO_printf(bio_err,
|
||
|
|
"WARNING: can't open config file: %s\n",p);
|
||
|
|
+#endif
|
||
|
|
ERR_clear_error();
|
||
|
|
NCONF_free(config);
|
||
|
|
config = NULL;
|
||
|
|
--- openssl-1.0.0.orig/apps/progs.h 2009-06-30 08:08:38.000000000 -0700
|
||
|
|
+++ openssl-1.0.0/apps/progs.h 2010-05-18 14:05:38.000000000 -0700
|
||
|
|
@@ -146,7 +152,9 @@ FUNCTION functions[] = {
|
||
|
|
{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
|
||
|
|
#endif
|
||
|
|
{FUNC_TYPE_GENERAL,"prime",prime_main},
|
||
|
|
+#if 0 /* ANDROID */
|
||
|
|
{FUNC_TYPE_GENERAL,"ts",ts_main},
|
||
|
|
+#endif
|
||
|
|
#ifndef OPENSSL_NO_SRP
|
||
|
|
{FUNC_TYPE_GENERAL,"srp",srp_main},
|
||
|
|
#endif
|
||
|
|
--- openssl-1.0.0.orig/apps/speed.c 2010-03-03 11:56:17.000000000 -0800
|
||
|
|
+++ openssl-1.0.0/apps/speed.c 2010-05-18 14:05:57.000000000 -0700
|
||
|
|
@@ -1718,6 +1718,7 @@ int MAIN(int argc, char **argv)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if 0 /* ANDROID */
|
||
|
|
if (doit[D_IGE_128_AES])
|
||
|
|
{
|
||
|
|
for (j=0; j<SIZE_NUM; j++)
|
||
|
|
@@ -1763,6 +1764,7 @@ int MAIN(int argc, char **argv)
|
||
|
|
|
||
|
|
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
#ifndef OPENSSL_NO_CAMELLIA
|
||
|
|
if (doit[D_CBC_128_CML])
|
||
|
|
{
|
||
|
|
--- openssl-1.0.0.orig/crypto/ui/ui_openssl.c 2009-10-04 09:43:21.000000000 -0700
|
||
|
|
+++ openssl-1.0.0/crypto/ui/ui_openssl.c 2010-05-18 13:36:26.000000000 -0700
|
||
|
|
@@ -184,7 +184,7 @@
|
||
|
|
# undef SGTTY
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if defined(linux) && !defined(TERMIO)
|
||
|
|
+#if defined(linux) && !defined(TERMIO) && !defined(__ANDROID__)
|
||
|
|
# undef TERMIOS
|
||
|
|
# define TERMIO
|
||
|
|
# undef SGTTY
|