diff options
| author | jnd@chromium.org <jnd@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-25 01:50:40 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-25 01:50:40 +0000 |
| commit | 480da75abf485e7e2a6be5acc0f71842368792c0 (patch) | |
| tree | 4ccbebefd1a3ab6fb0ab91cca34b0459ce145f17 /openssl/ssl/dtls1.h | |
| parent | 864570723968450a32e842d39f46acfd9a5bb5e5 (diff) | |
| download | openssl-480da75abf485e7e2a6be5acc0f71842368792c0.tar.gz | |
Upgrade chrome's OpenSSL to same version Android ships with.
This change is basically from openssl.org with the patches applied as per patches/README in https://android.googlesource.com/platform/external/openssl, plus 3 patches for Chromium to pass compliation and tests. Please refer to b/5428019 for more details.
BUG=None
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9254031
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@118977 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/ssl/dtls1.h')
| -rw-r--r-- | openssl/ssl/dtls1.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/openssl/ssl/dtls1.h b/openssl/ssl/dtls1.h index 697ff6e..2900d1d 100644 --- a/openssl/ssl/dtls1.h +++ b/openssl/ssl/dtls1.h @@ -108,15 +108,17 @@ extern "C" { typedef struct dtls1_bitmap_st { - PQ_64BIT map; - unsigned long length; /* sizeof the bitmap in bits */ - PQ_64BIT max_seq_num; /* max record number seen so far */ + unsigned long map; /* track 32 packets on 32-bit systems + and 64 - on 64-bit systems */ + unsigned char max_seq_num[8]; /* max record number seen so far, + 64-bit value in big-endian + encoding */ } DTLS1_BITMAP; struct dtls1_retransmit_state { EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */ - const EVP_MD *write_hash; /* used for mac generation */ + EVP_MD_CTX *write_hash; /* used for mac generation */ #ifndef OPENSSL_NO_COMP COMP_CTX *compress; /* compression */ #else |