diff options
| author | Pauli <paul.dale@oracle.com> | 2018-01-17 13:20:22 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-01-24 07:09:46 +1000 |
| commit | 4bed94f0c11ef63587c6b2edb03c3c438e221604 (patch) | |
| tree | 750293d626b103e4a8f503fc41f291388b15ecce /include | |
| parent | 3bf0c3fe31d5339524dae671064cc5fe9e4bda38 (diff) | |
SHA512/224 and SHA512/256
Support added for these two digests, available only via the EVP interface.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5093)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 4 | ||||
| -rw-r--r-- | include/openssl/obj_mac.h | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index aaecc1b80a..4a3fee12eb 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1,5 +1,5 @@ /* - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -702,6 +702,8 @@ const EVP_MD *EVP_sha224(void); const EVP_MD *EVP_sha256(void); const EVP_MD *EVP_sha384(void); const EVP_MD *EVP_sha512(void); +const EVP_MD *EVP_sha512_224(void); +const EVP_MD *EVP_sha512_256(void); const EVP_MD *EVP_sha3_224(void); const EVP_MD *EVP_sha3_256(void); const EVP_MD *EVP_sha3_384(void); diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index 8a9e25284c..b98c9183f2 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -572,6 +572,16 @@ #define NID_sha224WithRSAEncryption 671 #define OBJ_sha224WithRSAEncryption OBJ_pkcs1,14L +#define SN_sha512_224WithRSAEncryption "RSA-SHA512/224" +#define LN_sha512_224WithRSAEncryption "sha512-224WithRSAEncryption" +#define NID_sha512_224WithRSAEncryption 1145 +#define OBJ_sha512_224WithRSAEncryption OBJ_pkcs1,15L + +#define SN_sha512_256WithRSAEncryption "RSA-SHA512/256" +#define LN_sha512_256WithRSAEncryption "sha512-256WithRSAEncryption" +#define NID_sha512_256WithRSAEncryption 1146 +#define OBJ_sha512_256WithRSAEncryption OBJ_pkcs1,16L + #define SN_pkcs3 "pkcs3" #define NID_pkcs3 27 #define OBJ_pkcs3 OBJ_pkcs,3L |