diff options
| author | digit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-03-18 18:14:09 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-03-18 18:14:09 +0000 |
| commit | 7453c6c0666947e06d87565404f4397a4b387f91 (patch) | |
| tree | fea01a4282308a6c9f87e33d8c1fdd3e7dd9ec60 /openssl/ssl/s2_pkt.c | |
| parent | 136315fff2b416c62ab74ee8f287b4a57948cbc0 (diff) | |
| download | openssl-7453c6c0666947e06d87565404f4397a4b387f91.tar.gz | |
import_from_android.sh: Save subversion subdirectories
The previous commit didn't change the files under openssl/,
because the import_openssl.sh script used by import_from_android.sh
removes the 'openssl' directory completely to replace it with
new files.
This has the unfortunate side-effect of removing all .svn subdirs,
making it impossible to send the right set of changes during
"svn commit".
This patch modifies import_from_android.sh to save/restore the
subversion directories to avoid this problem.
BUG=none
TBR=wtc@chromium.org, rsleevi@google.com, agl@chromium.org
Review URL: https://codereview.chromium.org/12780010
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@188770 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/ssl/s2_pkt.c')
| -rw-r--r-- | openssl/ssl/s2_pkt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/openssl/ssl/s2_pkt.c b/openssl/ssl/s2_pkt.c index ac963b2..8bb6ab8 100644 --- a/openssl/ssl/s2_pkt.c +++ b/openssl/ssl/s2_pkt.c @@ -269,8 +269,7 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek) s->s2->ract_data_length-=mac_size; ssl2_mac(s,mac,0); s->s2->ract_data_length-=s->s2->padding; - if ( (memcmp(mac,s->s2->mac_data, - (unsigned int)mac_size) != 0) || + if ( (CRYPTO_memcmp(mac,s->s2->mac_data,mac_size) != 0) || (s->s2->rlength%EVP_CIPHER_CTX_block_size(s->enc_read_ctx) != 0)) { SSLerr(SSL_F_SSL2_READ_INTERNAL,SSL_R_BAD_MAC_DECODE); |