Deleted Added
full compact
e_aes_cbc_hmac_sha1.c (302408) e_aes_cbc_hmac_sha1.c (325335)
1/* ====================================================================
2 * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright

--- 845 unchanged lines hidden (view full) ---

854 return -1;
855
856 len = p[arg - 2] << 8 | p[arg - 1];
857
858 if (ctx->encrypt) {
859 key->payload_length = len;
860 if ((key->aux.tls_ver =
861 p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
1/* ====================================================================
2 * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright

--- 845 unchanged lines hidden (view full) ---

854 return -1;
855
856 len = p[arg - 2] << 8 | p[arg - 1];
857
858 if (ctx->encrypt) {
859 key->payload_length = len;
860 if ((key->aux.tls_ver =
861 p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
862 if (len < AES_BLOCK_SIZE)
863 return 0;
862 len -= AES_BLOCK_SIZE;
863 p[arg - 2] = len >> 8;
864 p[arg - 1] = len;
865 }
866 key->md = key->head;
867 SHA1_Update(&key->md, p, arg);
868
869 return (int)(((len + SHA_DIGEST_LENGTH +

--- 139 unchanged lines hidden ---
864 len -= AES_BLOCK_SIZE;
865 p[arg - 2] = len >> 8;
866 p[arg - 1] = len;
867 }
868 key->md = key->head;
869 SHA1_Update(&key->md, p, arg);
870
871 return (int)(((len + SHA_DIGEST_LENGTH +

--- 139 unchanged lines hidden ---