From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Wed, 27 May 2020 21:11:41 +0000 (+0000)
Subject: Merge branch 'tmp-fips-redefinition' into 'master'
X-Git-Tag: 3.6.14~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dca9dcdecd448b75ccae83b99f6a18b607ff694f;p=thirdparty%2Fgnutls.git

Merge branch 'tmp-fips-redefinition' into 'master'

fips: make FIPS140-2 mode enablement logic simpler

See merge request gnutls/gnutls!1253
---

dca9dcdecd448b75ccae83b99f6a18b607ff694f