From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Sun, 12 Jan 2020 12:38:20 +0000 (+0000)
Subject: Merge branch 'gost-priorities' into 'master'
X-Git-Tag: 3.6.12~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b2ceb2e945be38e8e64bd6ed7cdddca1ed0ac0b;p=thirdparty%2Fgnutls.git

Merge branch 'gost-priorities' into 'master'

Extend GOST priority settings and documentation

See merge request gnutls/gnutls!1160
---

0b2ceb2e945be38e8e64bd6ed7cdddca1ed0ac0b
diff --cc NEWS
index 2b4fd94210,5d4b55f2eb..accd32daf9
--- a/NEWS
+++ b/NEWS
@@@ -47,8 -40,10 +48,11 @@@ See the end for copying conditions
  ** certtool: The add_extension template option is considered even when generating
     a certificate from a certificate request.
  
+ ** libgnutls: added priority shortcuts for different GOST categories like
+    CIPHER-GOST-ALL, MAC-GOST-ALL, KX-GOST-ALL, SIGN-GOST-ALL, GROUP-GOST-ALL.
+ 
  ** API and ABI modifications:
 +GNUTLS_SFLAGS_CLI_REQUESTED_OCSP: Added
  gnutls_ocsp_req_const_t: Added