diff options
author | Richard Levitte <levitte@openssl.org> | 2020-01-21 15:05:56 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-01-28 08:08:22 +0100 |
commit | 505b41fc5a7a3cb255d2f62cf4902a1a5c1db2dd (patch) | |
tree | 5af49f556aaba41c16ad5f8ad5ddf32c0a5d76a4 /include | |
parent | d5aef5946bd9b113623ad778114768585a1f7a02 (diff) |
PROV: Adapt the DSA signature implementation to provide Algorithmidentifiers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10920)
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/dsa.h | 2 | ||||
-rw-r--r-- | include/internal/sizes.h | 1 | ||||
-rw-r--r-- | include/openssl/core_names.h | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/crypto/dsa.h b/include/crypto/dsa.h index 9afae37d2a..041ebd4f7f 100644 --- a/include/crypto/dsa.h +++ b/include/crypto/dsa.h @@ -11,3 +11,5 @@ int dsa_sign_int(OPENSSL_CTX *libctx, int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, DSA *dsa); + +const unsigned char *dsa_algorithmidentifier_encoding(int md_nid, size_t *len); diff --git a/include/internal/sizes.h b/include/internal/sizes.h index fab5cbdec7..00a5d3e88e 100644 --- a/include/internal/sizes.h +++ b/include/internal/sizes.h @@ -16,5 +16,6 @@ */ # define OSSL_MAX_NAME_SIZE 50 /* Algorithm name */ # define OSSL_MAX_PROPQUERY_SIZE 256 /* Property query strings */ +# define OSSL_MAX_ALGORITHM_ID_SIZE 256 /* AlgorithmIdentifier DER */ #endif diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index 20b06ff96b..cd701ab937 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -87,7 +87,16 @@ extern "C" { #define OSSL_DIGEST_PARAM_FLAGS "flags" /* ulong */ /* Known DIGEST names (not a complete list) */ -#define OSSL_DIGEST_NAME_MD5 "MD5" +#define OSSL_DIGEST_NAME_MD5 "MD5" +#define OSSL_DIGEST_NAME_SHA1 "SHA1" +#define OSSL_DIGEST_NAME_SHA2_224 "SHA2-224" +#define OSSL_DIGEST_NAME_SHA2_256 "SHA2-256" +#define OSSL_DIGEST_NAME_SHA2_384 "SHA2-384" +#define OSSL_DIGEST_NAME_SHA2_512 "SHA2-512" +#define OSSL_DIGEST_NAME_SHA3_224 "SHA3-224" +#define OSSL_DIGEST_NAME_SHA3_256 "SHA3-256" +#define OSSL_DIGEST_NAME_SHA3_384 "SHA3-384" +#define OSSL_DIGEST_NAME_SHA3_512 "SHA3-512" #define OSSL_DIGEST_NAME_KECCAK_KMAC128 "KECCAK-KMAC-128" #define OSSL_DIGEST_NAME_KECCAK_KMAC256 "KECCAK-KMAC-256" |