Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openssl/openssl-1.0.1-fips-140/patches/32_aes_cbc_len_check.patch
author Ron Jordan <ron.jordan@oracle.com>
Tue, 24 Mar 2015 20:05:38 -0700
branchs11u2-sru
changeset 4016 7f9e1e7611b8
parent 2921 8da1e7689d13
permissions -rw-r--r--
20735615 Upgrade OpenSSL version to 1.0.1m 20735495 problem in LIBRARY/OPENSSL 20735520 problem in LIBRARY/OPENSSL 20735531 problem in LIBRARY/OPENSSL 20735537 problem in LIBRARY/OPENSSL 20735541 problem in LIBRARY/OPENSSL 20735555 problem in LIBRARY/OPENSSL 20735563 problem in LIBRARY/OPENSSL 20688058 problem in LIBRARY/OPENSSL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2921
diff changeset 
     1
 
#
7f9e1e7611b8 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.
7f9e1e7611b8 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
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2921
diff changeset 
     6
 
@@ -536,8 +536,12 @@
7f9e1e7611b8 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,
7f9e1e7611b8 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
 
 {
4016
7f9e1e7611b8 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;
7f9e1e7611b8 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
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2921
diff changeset 
    13
 
+    if (len < bl)
7f9e1e7611b8 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
 
+
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2921
diff changeset 
    16
 
     if (dat->stream.cbc)
7f9e1e7611b8 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);
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2921
diff changeset 
    18
 
     else if (ctx->encrypt)
upstream/oracle/userland-gate