yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove SHA-224.

Browse Source
This commit is contained in:
Brian Smith 2015-10-31 22:25:23 -10:00
parent b1dd1f596d
commit 17f6149c64
4 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/rsa/rsa.c
View File

@ -179,12 +179,6 @@ static const struct pkcs1_sig_prefix kPKCS1SigPrefixes[] = {
{0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05,
0x00, 0x04, 0x14},
},
{
NID_sha224,
19,
{0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
0x04, 0x02, 0x04, 0x05, 0x00, 0x04, 0x1c},
},
{
NID_sha256,
19,

28
crypto/sha/sha256.c
View File

@ -67,20 +67,6 @@
#define SHA256_ASM
#endif
int SHA224_Init(SHA256_CTX *sha) {
memset(sha, 0, sizeof(SHA256_CTX));
sha->h[0] = 0xc1059ed8UL;
sha->h[1] = 0x367cd507UL;
sha->h[2] = 0x3070dd17UL;
sha->h[3] = 0xf70e5939UL;
sha->h[4] = 0xffc00b31UL;
sha->h[5] = 0x68581511UL;
sha->h[6] = 0x64f98fa7UL;
sha->h[7] = 0xbefa4fa4UL;
sha->md_len = SHA224_DIGEST_LENGTH;
return 1;
}
int SHA256_Init(SHA256_CTX *sha) {
memset(sha, 0, sizeof(SHA256_CTX));
sha->h[0] = 0x6a09e667UL;
@ -95,14 +81,6 @@ int SHA256_Init(SHA256_CTX *sha) {
return 1;
}
int SHA224_Update(SHA256_CTX *ctx, const void *data, size_t len) {
return SHA256_Update(ctx, data, len);
}
int SHA224_Final(uint8_t *md, SHA256_CTX *ctx) {
return SHA256_Final(md, ctx);
}
#define DATA_ORDER_IS_BIG_ENDIAN
#define HASH_LONG uint32_t
@ -123,12 +101,6 @@ int SHA224_Final(uint8_t *md, SHA256_CTX *ctx) {
uint32_t ll; \
unsigned int nn; \
switch ((c)->md_len) { \
case SHA224_DIGEST_LENGTH: \
for (nn = 0; nn < SHA224_DIGEST_LENGTH / 4; nn++) { \
ll = (c)->h[nn]; \
(void) HOST_l2c(ll, (s)); \
} \
break; \
case SHA256_DIGEST_LENGTH: \
for (nn = 0; nn < SHA256_DIGEST_LENGTH / 4; nn++) { \
ll = (c)->h[nn]; \

3
include/openssl/obj_mac.h
View File

@ -61,7 +61,6 @@
#define NID_md5 4
#define NID_md5_sha1 114
#define NID_sha1 64
#define NID_sha224 675
#define NID_sha256 672
#define NID_sha384 673
#define NID_sha512 674
@ -71,7 +70,6 @@
#define NID_ecdsa_with_SHA1 416
#define NID_ecdsa_with_Recommended 791
#define NID_ecdsa_with_Specified 792
#define NID_ecdsa_with_SHA224 793
#define NID_ecdsa_with_SHA256 794
#define NID_ecdsa_with_SHA384 795
#define NID_ecdsa_with_SHA512 796
@ -79,7 +77,6 @@
/* RSA signature algorithms */
#define NID_md5WithRSAEncryption 8
#define NID_sha1WithRSAEncryption 65
#define NID_sha224WithRSAEncryption 671
#define NID_sha256WithRSAEncryption 668
#define NID_sha384WithRSAEncryption 669
#define NID_sha512WithRSAEncryption 670

20
include/openssl/sha.h
View File

@ -101,26 +101,6 @@ struct sha_state_st {
};
/* SHA-224. */
/* SHA224_CBLOCK is the block size of SHA-224. */
#define SHA224_CBLOCK 64
/* SHA224_DIGEST_LENGTH is the length of a SHA-224 digest. */
#define SHA224_DIGEST_LENGTH 28
/* SHA224_Init initialises |sha| and returns 1. */
OPENSSL_EXPORT int SHA224_Init(SHA256_CTX *sha);
/* SHA224_Update adds |len| bytes from |data| to |sha| and returns 1. */
OPENSSL_EXPORT int SHA224_Update(SHA256_CTX *sha, const void *data, size_t len);
/* SHA224_Final adds the final padding to |sha| and writes the resulting digest
* to |md|, which must have at least |SHA224_DIGEST_LENGTH| bytes of space. It
* returns one on success and zero on programmer error. */
OPENSSL_EXPORT int SHA224_Final(uint8_t *md, SHA256_CTX *sha);
/* SHA-256. */
/* SHA256_CBLOCK is the block size of SHA-256. */