author | Ron Jordan <ron.jordan@oracle.com> |
Tue, 24 Mar 2015 20:05:38 -0700 | |
branch | s11u2-sru8-backport |
changeset 4020 | 8e3f49e23eaa |
parent 2921 | 8da1e7689d13 |
permissions | -rw-r--r-- |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
1 |
# |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
2 |
# This was developed in house and reported to the upstream. |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
3 |
# |
2921
8da1e7689d13
PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
4 |
--- openssl-1.0.1e/crypto/evp/e_aes.c Tue Jul 2 11:03:12 2013 |
8da1e7689d13
PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ openssl-1.0.1e/crypto/evp/e_aes.c.new Tue Jul 2 11:04:56 2013 |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
6 |
@@ -536,8 +536,12 @@ |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
7 |
static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
8 |
const unsigned char *in, size_t len) |
2921
8da1e7689d13
PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
9 |
{ |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
10 |
+ size_t bl = ctx->cipher->block_size; |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
11 |
EVP_AES_KEY *dat = (EVP_AES_KEY *) ctx->cipher_data; |
2921
8da1e7689d13
PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
12 |
|
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
13 |
+ if (len < bl) |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
14 |
+ return 1; |
2921
8da1e7689d13
PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
15 |
+ |
4020
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
16 |
if (dat->stream.cbc) |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
17 |
(*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv, ctx->encrypt); |
8e3f49e23eaa
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
2921
diff
changeset
|
18 |
else if (ctx->encrypt) |