diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-07-16 11:09:17 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-07-16 11:11:19 -0700 |
| commit | 4e0e02a98b7d235f19972c6a214fda924d6b958b (patch) | |
| tree | e5f4ed47b9af12e1beca58084a24101524024aa9 /patches | |
| parent | 4f16e619f191ec2041275b4ff5235663d583e484 (diff) | |
| download | replicant_openssl-4e0e02a98b7d235f19972c6a214fda924d6b958b.zip replicant_openssl-4e0e02a98b7d235f19972c6a214fda924d6b958b.tar.gz replicant_openssl-4e0e02a98b7d235f19972c6a214fda924d6b958b.tar.bz2 | |
Restoring openssl s_server, pkey, pkeyparam, pkeyutl
This is only for the /system/bin/openssl test app which does not ship
by default. Instructions for running s_server for testing are added in
README.android.
Change-Id: I9c6032871f853c780e4c9ffef9b2dd8ad009f32b
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/apps_Android.mk | 4 | ||||
| -rw-r--r-- | patches/progs.patch | 45 |
2 files changed, 4 insertions, 45 deletions
diff --git a/patches/apps_Android.mk b/patches/apps_Android.mk index e9f215c..06e07a2 100644 --- a/patches/apps_Android.mk +++ b/patches/apps_Android.mk @@ -32,6 +32,9 @@ LOCAL_SRC_FILES:= \ pkcs12.c \ pkcs7.c \ pkcs8.c \ + pkey.c \ + pkeyparam.c \ + pkeyutl.c \ prime.c \ rand.c \ req.c \ @@ -39,6 +42,7 @@ LOCAL_SRC_FILES:= \ rsautl.c \ s_cb.c \ s_client.c \ + s_server.c \ s_socket.c \ s_time.c \ sess_id.c \ diff --git a/patches/progs.patch b/patches/progs.patch index a00af00..16fd9b0 100644 --- a/patches/progs.patch +++ b/patches/progs.patch @@ -13,39 +13,6 @@ 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 -@@ -43,7 +43,9 @@ extern int spkac_main(int argc,char *arg - extern int smime_main(int argc,char *argv[]); - extern int rand_main(int argc,char *argv[]); - extern int engine_main(int argc,char *argv[]); -+#ifndef OPENSSL_NO_OCSP - extern int ocsp_main(int argc,char *argv[]); -+#endif - extern int prime_main(int argc,char *argv[]); - extern int ts_main(int argc,char *argv[]); - -@@ -107,7 +109,9 @@ FUNCTION functions[] = { - #endif - {FUNC_TYPE_GENERAL,"genpkey",genpkey_main}, - #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) -- {FUNC_TYPE_GENERAL,"s_server",s_server_main}, -+#if 0 /* ANDROID */ -+ {FUNC_TYPE_GENERAL,"s_server",s_server_main}, -+#endif - #endif - #if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3)) - {FUNC_TYPE_GENERAL,"s_client",s_client_main}, -@@ -133,9 +137,11 @@ FUNCTION functions[] = { - {FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main}, - #endif - {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main}, -+#if 0 /* ANDROID */ - {FUNC_TYPE_GENERAL,"pkey",pkey_main}, - {FUNC_TYPE_GENERAL,"pkeyparam",pkeyparam_main}, - {FUNC_TYPE_GENERAL,"pkeyutl",pkeyutl_main}, -+#endif - {FUNC_TYPE_GENERAL,"spkac",spkac_main}, - {FUNC_TYPE_GENERAL,"smime",smime_main}, - {FUNC_TYPE_GENERAL,"rand",rand_main}, @@ -146,7 +152,9 @@ FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, #endif @@ -85,15 +52,3 @@ # undef TERMIOS # define TERMIO # undef SGTTY ---- openssl-1.0.0.orig/apps/s_client.c 2009-12-16 12:28:28.000000000 -0800 -+++ openssl-1.0.0/apps/s_client.c 2010-04-14 14:25:09.000000000 -0700 -@@ -216,6 +216,9 @@ static int c_ign_eof=0; - /* Default PSK identity and key */ - static char *psk_identity="Client_identity"; - /*char *psk_key=NULL; by default PSK is not used */ -+#if 1 /* ANDROID */ -+char *psk_key=NULL; -+#endif - - static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity, - unsigned int max_identity_len, unsigned char *psk, |