summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2020-01-24 13:46:20 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2020-01-24 13:46:20 +0000
commit49719f8d1799b62eb565ce3aa9ffd255feab0ee6 (patch)
tree781f4e6bf30b3e35740481b0b8033caa033a014c /lib
parent0f285237b82e99a59a90bd0c22b746c748b63ffb (diff)
parent47a5f1e15a24005620fde80815a29d962ee7b826 (diff)
downloadgnutls-49719f8d1799b62eb565ce3aa9ffd255feab0ee6.tar.gz
Merge branch 'legacy-gost-512' into 'master'
x509: include digestParamSet into GOST 512-bit curves A and B params See merge request gnutls/gnutls!1173
Diffstat (limited to 'lib')
-rw-r--r--lib/x509/key_encode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c
index b9cbcff7bc..18668c8ad2 100644
--- a/lib/x509/key_encode.c
+++ b/lib/x509/key_encode.c
@@ -572,6 +572,10 @@ _gnutls_x509_write_gost_params(const gnutls_pk_params_st * params,
params->curve == GNUTLS_ECC_CURVE_GOST256CPXA ||
params->curve == GNUTLS_ECC_CURVE_GOST256CPXB))
oid = HASH_OID_STREEBOG_256;
+ else if (params->algo == GNUTLS_PK_GOST_12_512 &&
+ (params->curve == GNUTLS_ECC_CURVE_GOST512A ||
+ params->curve == GNUTLS_ECC_CURVE_GOST512B))
+ oid = HASH_OID_STREEBOG_512;
else
oid = NULL;