CVS commit: src/crypto/external/bsd/openssl/dist/crypto/sha
Module Name:src
Committed By: christos
Date: Sun Mar 22 20:16:49 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/sha: sha256.c
Log Message:
reduce diff with upstream
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.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/sha/sha256.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.c:1.9 src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.c:1.10
--- src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.c:1.9 Sat Mar 21 20:53:08 2020
+++ src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.c Sun Mar 22 16:16:49 2020
@@ -168,7 +168,7 @@ static const SHA_LONG K256[64] = {
static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
size_t num)
{
-MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1, T2;
+unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1, T2;
SHA_LONG X[16], l;
int i;
const unsigned char *data = in;
@@ -246,7 +246,7 @@ static void sha256_block_data_order(SHA2
static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
size_t num)
{
-MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1;
+unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1;
SHA_LONG X[16];
int i;
const unsigned char *data = in;
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/sha/asm
Module Name:src Committed By: christos Date: Sun Mar 20 22:17:13 UTC 2016 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl Log Message: move scratch stack offset from 64 to 72 bytes so that it is aligned properly. We core-dump using xmm instructions with gcc-5.3 otherwise. This is all fixed a lot better in openssl-1.1.0-pre4 and I am tempted To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl 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/sha/asm/sha1-x86_64.pl diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.2 src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.3 --- src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.2 Thu May 28 15:13:33 2015 +++ src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl Sun Mar 20 18:17:13 2016 @@ -308,7 +308,7 @@ _ssse3_shortcut: push %rbx push %rbp push %r12 - lea `-64-($win64?5*16:0)`(%rsp),%rsp + lea `-64-($win64?5*16:8)`(%rsp),%rsp ___ $code.=<<___ if ($win64); movaps %xmm6,64+0(%rsp) @@ -698,7 +698,7 @@ $code.=<<___ if ($win64); movaps 64+64(%rsp),%xmm10 ___ $code.=<<___; - lea `64+($win64?5*16:0)`(%rsp),%rsi + lea `64+($win64?5*16:8)`(%rsp),%rsi mov 0(%rsi),%r12 mov 8(%rsi),%rbp mov 16(%rsi),%rbx @@ -728,7 +728,7 @@ _avx_shortcut: push %rbx push %rbp push %r12 - lea `-64-($win64?5*16:0)`(%rsp),%rsp + lea `-64-($win64?5*16:8)`(%rsp),%rsp ___ $code.=<<___ if ($win64); movaps %xmm6,64+0(%rsp) @@ -1056,7 +1056,7 @@ $code.=<<___ if ($win64); movaps 64+64(%rsp),%xmm10 ___ $code.=<<___; - lea `64+($win64?5*16:0)`(%rsp),%rsi + lea `64+($win64?5*16:8)`(%rsp),%rsi mov 0(%rsi),%r12 mov 8(%rsi),%rbp mov 16(%rsi),%rbx
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/sha
Module Name:src Committed By: christos Date: Mon Jul 20 15:34:49 UTC 2009 Modified Files: src/crypto/external/bsd/openssl/dist/crypto/sha: sha.h Log Message: make sha256/512 binary compatible with the libc version which we now use. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h 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/sha/sha.h diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h:1.2 src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h:1.3 --- src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h:1.2 Sun Jul 19 19:30:41 2009 +++ src/crypto/external/bsd/openssl/dist/crypto/sha/sha.h Mon Jul 20 11:34:49 2009 @@ -136,7 +136,6 @@ SHA_LONG h[8]; SHA_LONG Nl,Nh; SHA_LONG data[SHA_LBLOCK]; - unsigned int num,md_len; } SHA256_CTX; #ifndef OPENSSL_NO_SHA256 @@ -182,7 +181,6 @@ SHA_LONG64 d[SHA_LBLOCK]; unsigned char p[SHA512_CBLOCK]; } u; - unsigned int num,md_len; } SHA512_CTX; #endif
