diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-12-18 21:27:35 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-12-18 23:03:03 +0100 |
| commit | 2ec4181ba92fc6b828687d2dc47c13dcd35a5d93 (patch) | |
| tree | da8b0d8fffb551985ee5e1da601bc24025415fb9 /crypto | |
| parent | 0294b2be5f4c11e60620c0018674ff0e17b14238 (diff) | |
sha512.c: fullfull implicit API contract in SHA512_Transform.
SHA512_Transform was initially added rather as tribute to tradition
than for practucal reasons. But use was recently found in ssl/s3_cbc.c
and it turned to be problematic on platforms that don't tolerate
misasligned references to memory and lack assembly subroutine.
(cherry picked from commit cdd1acd788020d2c525331da1712ada778f1373c)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/sha/sha512.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c index 50dd7dc744..50c229ddeb 100644 --- a/crypto/sha/sha512.c +++ b/crypto/sha/sha512.c @@ -232,7 +232,14 @@ int SHA384_Update (SHA512_CTX *c, const void *data, size_t len) { return SHA512_Update (c,data,len); } void SHA512_Transform (SHA512_CTX *c, const unsigned char *data) -{ sha512_block_data_order (c,data,1); } + { +#ifndef SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA + if ((size_t)data%sizeof(c->u.d[0]) != 0) + memcpy(c->u.p,data,sizeof(c->u.p)), + data = c->u.p; +#endif + sha512_block_data_order (c,data,1); + } unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md) { |