| author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
| Fri, 03 May 2013 16:10:11 -0700 | |
| branch | s11-update |
| changeset 2593 | b92e6df5eaf0 |
| parent 2575 | components/openssl/openssl-1.0.0/patches/31_dtls_version-1.0.0.patch@b6ffd60bade0 |
| child 2681 | f7ee98f5749e |
| permissions | -rw-r--r-- |
|
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
1 |
--- openssl-1.0.1e/ssl/s3_cbc.c 2013-02-14 08:06:58.000000000 -0800 |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
2 |
+++ openssl-1.0.1e/ssl/s3_cbc.c.orig 2013-02-14 03:04:08.440194448 -0700 |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
3 |
@@ -148,7 +148,7 @@ |
|
2575
b6ffd60bade0
16211866 problem in UTILITY/OPENSSL
Jan Parcel <Jan.Parcel@oracle.com>
parents:
diff
changeset
|
4 |
unsigned padding_length, good, to_check, i; |
|
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
5 |
const unsigned overhead = 1 /* padding length byte */ + mac_size; |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
6 |
/* Check if version requires explicit IV */ |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
7 |
- if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION) |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
8 |
+ if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER) |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
9 |
{
|
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
10 |
/* These lengths are all public so we can test them in |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2575
diff
changeset
|
11 |
* non-constant time. |