From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001 From: Andrzej Szeszo <aszeszo@gmail.com> Date: Tue, 04 Jun 2013 12:32:37 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster --- components/openssl/openssl-1.0.1/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/components/openssl/openssl-1.0.1/Makefile b/components/openssl/openssl-1.0.1/Makefile index ab15654..8c957d5 100644 --- a/components/openssl/openssl-1.0.1/Makefile +++ b/components/openssl/openssl-1.0.1/Makefile @@ -273,6 +273,7 @@ crypto/evp/pmeth_fn.o crypto/evp/pmeth_gn.o crypto/evp/pmeth_lib.o \ crypto/ex_data.o crypto/hmac/hm_ameth.o crypto/hmac/hm_pmeth.o \ crypto/hmac/hmac.o crypto/lhash/lhash.o crypto/md4/md4_dgst.o \ + crypto/md5/md5-sparcv9.o \ crypto/md5/md5_dgst.o crypto/mem.o crypto/mem_dbg.o crypto/modes/cbc128.o \ crypto/modes/ccm128.o crypto/modes/cfb128.o crypto/modes/ctr128.o \ crypto/modes/gcm128.o crypto/modes/ghash-sparcv9.o crypto/modes/ofb128.o \ @@ -324,7 +325,7 @@ ssl/s3_both.o ssl/s3_clnt.o ssl/s3_enc.o ssl/s3_lib.o ssl/s3_pkt.o \ ssl/ssl_algs.o ssl/ssl_asn1.o ssl/ssl_cert.o ssl/ssl_ciph.o ssl/ssl_err.o \ ssl/ssl_err2.o ssl/ssl_lib.o ssl/ssl_rsa.o ssl/ssl_sess.o ssl/t1_enc.o \ - ssl/t1_lib.o ssl/t1_reneg.o ssl/d1_srtp.o + ssl/t1_lib.o ssl/t1_reneg.o ssl/d1_srtp.o ssl/s3_cbc.o ssl/t1_clnt.o # Linking of openssl bits for wanboot. # Interface for wanboot is specified in mapfile.wanboot. Object files are -- Gitblit v1.9.3