CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src Committed By: christos Date: Sun Mar 22 20:09:17 UTC 2020 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c Log Message: reduce diff with upstream. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.21 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.22 --- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.21 Sun Mar 22 16:05:29 2020 +++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Sun Mar 22 16:09:17 2020 @@ -2551,7 +2551,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m #if defined(OPENSSL_CPUID_OBJ) && defined(AES_ASM) && (defined(__arm__) || defined(__arm) || defined(__aarch64__)) # include "arm_arch.h" -# if __ARM_MAX_ARCH__>= 7 +# if __ARM_MAX_ARCH__>=7 # if defined(BSAES_ASM) # define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON) # endif @@ -2559,7 +2559,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m # define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON) # endif # endif -# if __ARM_MAX_ARCH__>= 8 +# if __ARM_MAX_ARCH__>=8 # define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES) # define HWAES_set_encrypt_key aes_v8_set_encrypt_key # define HWAES_set_decrypt_key aes_v8_set_decrypt_key
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src
Committed By: christos
Date: Sun Mar 22 20:05:29 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
Log Message:
put back removed code
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.20 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.21
--- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.20 Sat Mar 21 20:53:05 2020
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Sun Mar 22 16:05:29 2020
@@ -2801,6 +2801,8 @@ static int aes_cfb1_cipher(EVP_CIPHER_CT
EVP_CIPHER_CTX_encrypting(ctx), dat->block);
EVP_CIPHER_CTX_set_num(ctx, num);
len -= MAXBITCHUNK;
+out += MAXBITCHUNK;
+in += MAXBITCHUNK;
}
if (len) {
int num = EVP_CIPHER_CTX_num(ctx);
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src Committed By: christos Date: Fri Mar 9 01:33:58 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c Log Message: Don't define the v8 functions for v7! To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.13 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.14 --- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.13 Wed Mar 7 11:06:29 2018 +++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Thu Mar 8 20:33:57 2018 @@ -981,13 +981,15 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m #if defined(OPENSSL_CPUID_OBJ) && defined(AES_ASM) && (defined(__arm__) || defined(__arm) || defined(__aarch64__)) # include "arm_arch.h" -# if __ARM_MAX_ARCH__>=7 +# if __ARM_MAX_ARCH__>= 7 # if defined(BSAES_ASM) # define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON) # endif # if defined(VPAES_ASM) # define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON) # endif +# endif +# if __ARM_MAX_ARCH__>= 8 # define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES) # define HWAES_set_encrypt_key aes_v8_set_encrypt_key # define HWAES_set_decrypt_key aes_v8_set_decrypt_key
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src Committed By: christos Date: Wed Mar 7 16:06:29 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c Log Message: Enable AES_ASM explicitly not by just looking at the processor, like we do for other archs! To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.12 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.13 --- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.12 Thu Feb 8 16:51:28 2018 +++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Wed Mar 7 11:06:29 2018 @@ -979,7 +979,7 @@ const EVP_CIPHER *EVP_aes_##keylen##_##m #endif -#if defined(OPENSSL_CPUID_OBJ) && (defined(__arm__) || defined(__arm) || defined(__aarch64__)) +#if defined(OPENSSL_CPUID_OBJ) && defined(AES_ASM) && (defined(__arm__) || defined(__arm) || defined(__aarch64__)) # include "arm_arch.h" # if __ARM_MAX_ARCH__>=7 # if defined(BSAES_ASM)
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src
Committed By: christos
Date: Tue Feb 13 22:35:47 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/evp: m_sha1.c
Log Message:
Provide SHAR384 flavors: The OpenSSL SHA512_Final implementation is re-used
to implement SHA384_Final, but does the right thing by checking the internally
kept digest size. The NetBSD libc implementation provides two entry points
that write a different size digest, so if we use the SHA512_Final from here
we end up overwriting memory.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.8 src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.9
--- src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.8 Thu Feb 8 16:51:28 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c Tue Feb 13 17:35:47 2018
@@ -178,6 +178,16 @@ static int init384(EVP_MD_CTX *ctx)
return SHA384_Init(EVP_MD_CTX_md_data(ctx));
}
+static int update384(EVP_MD_CTX *ctx, const void *data, size_t count)
+{
+return SHA384_Update(EVP_MD_CTX_md_data(ctx), data, count);
+}
+
+static int final384(EVP_MD_CTX *ctx, unsigned char *md)
+{
+return SHA384_Final(md, EVP_MD_CTX_md_data(ctx));
+}
+
static int init512(EVP_MD_CTX *ctx)
{
return SHA512_Init(EVP_MD_CTX_md_data(ctx));
@@ -200,8 +210,8 @@ static const EVP_MD sha384_md = {
SHA384_DIGEST_LENGTH,
EVP_MD_FLAG_DIGALGID_ABSENT,
init384,
-update512,
-final512,
+update384,
+final384,
NULL,
NULL,
SHA512_CBLOCK,
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/evp
Module Name:src Committed By: riastradh Date: Mon Feb 18 21:20:50 UTC 2013 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c Log Message: Touch e_aes.c to force a rebuild with new compiler flags for AES-NI. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.1.1.4 src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.2 --- src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c:1.1.1.4 Tue Feb 5 19:04:44 2013 +++ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c Mon Feb 18 21:20:50 2013 @@ -48,6 +48,13 @@ * */ +/* + * [This comment is a kludge to force e_aes.o to be rebuilt after + * changes to the makefiles to fix AES-NI support. You may safely + * remove this comment to reduce the diffs from upstream OpenSSL. + * --riastradh, 2013-02-18] + */ + #include openssl/opensslconf.h #ifndef OPENSSL_NO_AES #include openssl/evp.h
