diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-01-04 13:22:32 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-01-04 14:13:49 -0800 |
| commit | 7b476c43f6a45574eb34697244b592e7b09f05a3 (patch) | |
| tree | d8526a6da6ff7fb5c876ab92414e36322d949820 /patches | |
| parent | ce96fb211b9a44bbd7fb5ef7ed0e6c1244045c2e (diff) | |
| download | replicant_openssl-7b476c43f6a45574eb34697244b592e7b09f05a3.zip replicant_openssl-7b476c43f6a45574eb34697244b592e7b09f05a3.tar.gz replicant_openssl-7b476c43f6a45574eb34697244b592e7b09f05a3.tar.bz2 | |
Upgrade to openssl-1.0.0f
Bug: 5822335
Change-Id: Iadf81526a10b072ff323730db0e1897faea7a13f
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/README | 8 | ||||
| -rw-r--r-- | patches/apps_Android.mk | 4 | ||||
| -rw-r--r-- | patches/openssl_no_dtls1.patch | 13 | ||||
| -rw-r--r-- | patches/sslv3_uninit_padding.patch | 14 |
4 files changed, 17 insertions, 22 deletions
diff --git a/patches/README b/patches/README index 54b6e06..b2c56ed 100644 --- a/patches/README +++ b/patches/README @@ -30,10 +30,10 @@ npn.patch Transport Layer Security (TLS) Next Protocol Negotiation Extension -sslv3_uninit_padding.patch - -This patch sets the padding for SSLv3 block ciphers to zero. - sha1_armv4_large.patch This patch eliminates memory stores to addresses below SP. + +openssl_no_dtls1.patch + +Add missing #ifndef OPENSSL_NO_DTLS1 diff --git a/patches/apps_Android.mk b/patches/apps_Android.mk index 20cc5a9..c2dc2d7 100644 --- a/patches/apps_Android.mk +++ b/patches/apps_Android.mk @@ -62,10 +62,6 @@ local_c_includes := \ local_cflags := -DMONOLITH -# These flags omit whole features from the commandline "openssl". -# However, portions of these features are actually turned on. -local_cflags += -DOPENSSL_NO_DTLS1 - include $(CLEAR_VARS) LOCAL_MODULE:= openssl LOCAL_MODULE_TAGS := optional diff --git a/patches/openssl_no_dtls1.patch b/patches/openssl_no_dtls1.patch new file mode 100644 index 0000000..8b61cd3 --- /dev/null +++ b/patches/openssl_no_dtls1.patch @@ -0,0 +1,13 @@ +--- openssl-1.0.0f.orig/ssl/ssl_lib.c 2012-01-04 22:13:21.000000000 +0000 ++++ openssl-1.0.0f/ssl/ssl_lib.c 2012-01-04 22:13:21.000000000 +0000 +@@ -1063,8 +1063,10 @@ long SSL_ctrl(SSL *s,int cmd,long larg,v + s->max_cert_list=larg; + return(l); + case SSL_CTRL_SET_MTU: ++#ifndef OPENSSL_NO_DTLS1 + if (larg < (long)dtls1_min_mtu()) + return 0; ++#endif + + if (SSL_version(s) == DTLS1_VERSION || + SSL_version(s) == DTLS1_BAD_VER) diff --git a/patches/sslv3_uninit_padding.patch b/patches/sslv3_uninit_padding.patch deleted file mode 100644 index 89fff7b..0000000 --- a/patches/sslv3_uninit_padding.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ssl/s3_enc.c b/google3/third_party/openssl/openssl/ssl/s3_enc.c -index 58386e1..b145970 100644 ---- a/ssl/s3_enc.c -+++ b/ssl/s3_enc.c -@@ -511,6 +511,9 @@ int ssl3_enc(SSL *s, int send) - - /* we need to add 'i-1' padding bytes */ - l+=i; -+ /* the last of these zero bytes will be overwritten -+ * with the padding length. */ -+ memset(&rec->input[rec->length], 0, i); - rec->length+=i; - rec->input[l-1]=(i-1); - } |