Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: patches/progs.patch

Issue 10911247: Upstream openssl to version 1.0.1c (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « patches/openssl_no_dtls1.patch ('k') | patches/testssl.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 --- openssl-1.0.0.orig/apps/openssl.c 2009-10-04 09:43:21.000000000 -0700 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 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[]) 3 @@ -275,8 +275,10 @@ int main(int Argc, char *Argv[])
4 if (ERR_GET_REASON(ERR_peek_last_error()) 4 if (ERR_GET_REASON(ERR_peek_last_error())
5 == CONF_R_NO_SUCH_FILE) 5 == CONF_R_NO_SUCH_FILE)
6 { 6 {
7 +#if 0 /* ANDROID */ 7 +#if 0 /* ANDROID */
8 BIO_printf(bio_err, 8 BIO_printf(bio_err,
9 "WARNING: can't open config file: %s\n",p); 9 "WARNING: can't open config file: %s\n",p);
10 +#endif 10 +#endif
11 ERR_clear_error(); 11 ERR_clear_error();
12 NCONF_free(config); 12 NCONF_free(config);
13 config = NULL; 13 config = NULL;
14 --- openssl-1.0.0.orig/apps/progs.h 2009-06-30 08:08:38.000000000 -0700 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 15 +++ openssl-1.0.0/apps/progs.h 2010-05-18 14:05:38.000000000 -0700
16 @@ -146,7 +152,9 @@ FUNCTION functions[] = { 16 @@ -146,7 +152,9 @@ FUNCTION functions[] = {
17 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, 17 {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
18 #endif 18 #endif
19 {FUNC_TYPE_GENERAL,"prime",prime_main}, 19 {FUNC_TYPE_GENERAL,"prime",prime_main},
20 +#if 0 /* ANDROID */ 20 +#if 0 /* ANDROID */
21 {FUNC_TYPE_GENERAL,"ts",ts_main}, 21 {FUNC_TYPE_GENERAL,"ts",ts_main},
22 +#endif 22 +#endif
23 #ifndef OPENSSL_NO_MD2 23 #ifndef OPENSSL_NO_SRP
24 » {FUNC_TYPE_MD,"md2",dgst_main}, 24 » {FUNC_TYPE_GENERAL,"srp",srp_main},
25 #endif 25 #endif
26 --- openssl-1.0.0.orig/apps/speed.c 2010-03-03 11:56:17.000000000 -0800 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 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) 28 @@ -1718,6 +1718,7 @@ int MAIN(int argc, char **argv)
29 } 29 }
30 } 30 }
31 31
32 +#if 0 /* ANDROID */ 32 +#if 0 /* ANDROID */
33 if (doit[D_IGE_128_AES]) 33 if (doit[D_IGE_128_AES])
34 { 34 {
(...skipping 10 matching lines...) Expand all
45 +++ openssl-1.0.0/crypto/ui/ui_openssl.c 2010-05-18 13:36:26.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 @@ 46 @@ -184,7 +184,7 @@
47 # undef SGTTY 47 # undef SGTTY
48 #endif 48 #endif
49 49
50 -#if defined(linux) && !defined(TERMIO) 50 -#if defined(linux) && !defined(TERMIO)
51 +#if defined(linux) && !defined(TERMIO) && !defined(__ANDROID__) 51 +#if defined(linux) && !defined(TERMIO) && !defined(__ANDROID__)
52 # undef TERMIOS 52 # undef TERMIOS
53 # define TERMIO 53 # define TERMIO
54 # undef SGTTY 54 # undef SGTTY
OLDNEW
« no previous file with comments | « patches/openssl_no_dtls1.patch ('k') | patches/testssl.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698