diff --git a/gnutls-3.8.4.tar.xz b/gnutls-3.8.4.tar.xz
deleted file mode 100644
index 4194b4e..0000000
--- a/gnutls-3.8.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b
-size 6487520
diff --git a/gnutls-3.8.4.tar.xz.sig b/gnutls-3.8.4.tar.xz.sig
deleted file mode 100644
index 203aae4..0000000
Binary files a/gnutls-3.8.4.tar.xz.sig and /dev/null differ
diff --git a/gnutls-3.8.5.tar.xz b/gnutls-3.8.5.tar.xz
new file mode 100644
index 0000000..4dab5d4
--- /dev/null
+++ b/gnutls-3.8.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc
+size 6491504
diff --git a/gnutls-3.8.5.tar.xz.sig b/gnutls-3.8.5.tar.xz.sig
new file mode 100644
index 0000000..ad2c423
Binary files /dev/null and b/gnutls-3.8.5.tar.xz.sig differ
diff --git a/gnutls-FIPS-140-3-references.patch b/gnutls-FIPS-140-3-references.patch
index c32f32e..b511319 100644
--- a/gnutls-FIPS-140-3-references.patch
+++ b/gnutls-FIPS-140-3-references.patch
@@ -1,7 +1,7 @@
-Index: gnutls-3.8.4/configure.ac
+Index: gnutls-3.8.5/configure.ac
===================================================================
---- gnutls-3.8.4.orig/configure.ac
-+++ gnutls-3.8.4/configure.ac
+--- gnutls-3.8.5.orig/configure.ac
++++ gnutls-3.8.5/configure.ac
@@ -623,19 +623,19 @@ LT_INIT([disable-static,win32-dll,shared
AC_LIB_HAVE_LINKFLAGS(dl,, [#include ], [dladdr (0, 0);])
@@ -25,10 +25,10 @@ Index: gnutls-3.8.4/configure.ac
AC_ARG_WITH(fips140-module-name, AS_HELP_STRING([--with-fips140-module-name],
[specify the FIPS140 module name]),
-Index: gnutls-3.8.4/doc/cha-gtls-app.texi
+Index: gnutls-3.8.5/doc/cha-gtls-app.texi
===================================================================
---- gnutls-3.8.4.orig/doc/cha-gtls-app.texi
-+++ gnutls-3.8.4/doc/cha-gtls-app.texi
+--- gnutls-3.8.5.orig/doc/cha-gtls-app.texi
++++ gnutls-3.8.5/doc/cha-gtls-app.texi
@@ -222,7 +222,7 @@ CPU. The currently available options are
@end itemize
@@ -38,10 +38,10 @@ Index: gnutls-3.8.4/doc/cha-gtls-app.texi
if set to one it will force the FIPS mode enablement.
@end multitable
-Index: gnutls-3.8.4/doc/cha-internals.texi
+Index: gnutls-3.8.5/doc/cha-internals.texi
===================================================================
---- gnutls-3.8.4.orig/doc/cha-internals.texi
-+++ gnutls-3.8.4/doc/cha-internals.texi
+--- gnutls-3.8.5.orig/doc/cha-internals.texi
++++ gnutls-3.8.5/doc/cha-internals.texi
@@ -14,7 +14,7 @@ happens inside the black box.
* TLS Hello Extension Handling::
* Cryptographic Backend::
@@ -162,10 +162,10 @@ Index: gnutls-3.8.4/doc/cha-internals.texi
operation. It can be attached to the current execution thread with
@funcref{gnutls_fips140_push_context} and its internal state will be
updated until it is detached with
-Index: gnutls-3.8.4/doc/enums.texi
+Index: gnutls-3.8.5/doc/enums.texi
===================================================================
---- gnutls-3.8.4.orig/doc/enums.texi
-+++ gnutls-3.8.4/doc/enums.texi
+--- gnutls-3.8.5.orig/doc/enums.texi
++++ gnutls-3.8.5/doc/enums.texi
@@ -1190,7 +1190,7 @@ application traffic secret is installed
@c gnutls_fips_mode_t
@table @code
@@ -186,10 +186,10 @@ Index: gnutls-3.8.4/doc/enums.texi
application is aware of the followed security policy, and needs
to utilize disallowed operations for other reasons (e.g., compatibility).
@item GNUTLS_@-FIPS140_@-LOG
-Index: gnutls-3.8.4/doc/functions/gnutls_fips140_set_mode
+Index: gnutls-3.8.5/doc/functions/gnutls_fips140_set_mode
===================================================================
---- gnutls-3.8.4.orig/doc/functions/gnutls_fips140_set_mode
-+++ gnutls-3.8.4/doc/functions/gnutls_fips140_set_mode
+--- gnutls-3.8.5.orig/doc/functions/gnutls_fips140_set_mode
++++ gnutls-3.8.5/doc/functions/gnutls_fips140_set_mode
@@ -3,7 +3,7 @@
@@ -215,11 +215,11 @@ Index: gnutls-3.8.4/doc/functions/gnutls_fips140_set_mode
values for @code{mode} or to @code{GNUTLS_FIPS140_SELFTESTS} mode, the library
switches to @code{GNUTLS_FIPS140_STRICT} mode.
-Index: gnutls-3.8.4/doc/gnutls.html
+Index: gnutls-3.8.5/doc/gnutls.html
===================================================================
---- gnutls-3.8.4.orig/doc/gnutls.html
-+++ gnutls-3.8.4/doc/gnutls.html
-@@ -484,7 +484,7 @@ Documentation License”.
+--- gnutls-3.8.5.orig/doc/gnutls.html
++++ gnutls-3.8.5/doc/gnutls.html
+@@ -485,7 +485,7 @@ Documentation License”.
11.4 TLS Extension Handling
11.5 Cryptographic Backend
11.6 Random Number Generators
@@ -228,7 +228,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
Appendix A Upgrading from previous versions
Appendix B Support
-@@ -9041,7 +9041,7 @@ CPU. The currently available options are
+@@ -9045,7 +9045,7 @@ CPU. The currently available options are
0x200000: Enable VIA PHE
0x400000: Enable VIA PHE SHA512
@@ -237,7 +237,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
if set to one it will force the FIPS mode enablement.
-@@ -18452,7 +18452,7 @@ None:
+@@ -18477,7 +18477,7 @@ None:
--inline-commands-prefix=str Change the default delimiter for inline commands
--provider=file Specify the PKCS #11 provider library
- file must pre-exist
@@ -246,7 +246,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
--list-config Reports the configuration of the library
--logfile=str Redirect informational messages to a specific file
--keymatexport=str Label used for exporting keying material
-@@ -19474,7 +19474,7 @@ happens inside the black box.
+@@ -19499,7 +19499,7 @@ happens inside the black box.
TLS Extension Handling
Cryptographic Backend
Random Number Generators
@@ -255,7 +255,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
@@ -302,7 +302,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
as follows.
-@@ -20172,12 +20172,12 @@ as follows.
+@@ -20197,12 +20197,12 @@ as follows.
- Algorithm self-tests are run on library load
@@ -318,7 +318,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
Any cryptographic operation will be refused if any of the self-tests failed
-@@ -20186,7 +20186,7 @@ modified as follows.
+@@ -20211,7 +20211,7 @@ modified as follows.
environment variable GNUTLS_SKIP_FIPS_INTEGRITY_CHECKS
will disable
the library integrity tests on startup, and the variable
GNUTLS_FORCE_FIPS_MODE
can be set to force a value from
@@ -327,7 +327,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
mode, while ’0’ will disable it.
The integrity checks for the dependent libraries and GnuTLS are performed
-@@ -20194,13 +20194,13 @@ using ’.hmac’ files which ar
+@@ -20219,13 +20219,13 @@ using ’.hmac’ files which ar
key for the operations can be provided on compile-time with the configure
option ’–with-fips140-key’. The MAC algorithm used is HMAC-SHA256.
@@ -344,7 +344,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
the application can relax these requirements via gnutls_fips140_set_mode
which can switch to alternative modes as in Figure 11.5.
-@@ -20209,7 +20209,7 @@ which can switch to alternative modes as
+@@ -20234,7 +20234,7 @@ which can switch to alternative modes as
GNUTLS_FIPS140_DISABLED
@@ -353,7 +353,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
GNUTLS_FIPS140_STRICT
The default mode; all forbidden operations will cause an
-@@ -20220,8 +20220,8 @@ operation failure via error code.
+@@ -20245,8 +20245,8 @@ operation failure via error code.
cannot be set or seen by applications.
GNUTLS_FIPS140_LAX
@@ -364,7 +364,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
application is aware of the followed security policy, and needs
to utilize disallowed operations for other reasons (e.g., compatibility).
-@@ -20233,7 +20233,7 @@ to a message to the audit callback funct
+@@ -20258,7 +20258,7 @@ to a message to the audit callback funct
Figure 11.5: The gnutls_fips_mode_t
enumeration.
The intention of this API is to be used by applications which may run in
@@ -373,7 +373,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
e.g., for non-security related purposes. In these cases applications should
wrap the non-compliant code within blocks like the following.
-@@ -20262,9 +20262,9 @@ if (gnutls_fips140_mode_enabled())
+@@ -20287,9 +20287,9 @@ if (gnutls_fips140_mode_enabled())
The reason of the GNUTLS_FIPS140_SET_MODE_THREAD
flag in the
previous calls is to localize the change in the mode. Note also, that
such a block has no effect when the library is not operating
@@ -385,7 +385,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, 0);
-@@ -20287,7 +20287,7 @@ performed within a given context.
+@@ -20312,7 +20312,7 @@ performed within a given context.
int gnutls_fips140_pop_context ( void)
@@ -394,7 +394,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
operation. It can be attached to the current execution thread with
gnutls_fips140_push_context and its internal state will be
updated until it is detached with
-@@ -20660,8 +20660,8 @@ Previous:
@@ -405,7 +405,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
-@@ -24576,7 +24576,7 @@ unusable. This function is not thread-s
+@@ -24602,7 +24602,7 @@ unusable. This function is not thread-s
gnutls_fips140_set_mode
- Function:
void
gnutls_fips140_set_mode (gnutls_fips_mode_t mode, unsigned flags)
¶
@@ -414,7 +414,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
flags: should be zero or GNUTLS_FIPS140_SET_MODE_THREAD
-@@ -24585,13 +24585,13 @@ unusable. This function is not thread-s
+@@ -24611,13 +24611,13 @@ unusable. This function is not thread-s
behavior with no flags after threads are created is undefined.
When the flag GNUTLS_FIPS140_SET_MODE_THREAD
is specified
@@ -430,7 +430,7 @@ Index: gnutls-3.8.4/doc/gnutls.html
values for mode
or to GNUTLS_FIPS140_SELFTESTS
mode, the library
switches to GNUTLS_FIPS140_STRICT
mode.
-@@ -46970,7 +46970,7 @@ Next: | gnutls_fingerprint : | | Core TLS API |
| gnutls_fips140_context_deinit : | | Core TLS API |
| gnutls_fips140_context_init : | | Core TLS API |
@@ -439,11 +439,11 @@ Index: gnutls-3.8.4/doc/gnutls.html
| gnutls_fips140_get_operation_state : | | Core TLS API |
| gnutls_fips140_mode_enabled : | | Core TLS API |
| gnutls_fips140_pop_context : | | Core TLS API |
-Index: gnutls-3.8.4/doc/gnutls.info-3
+Index: gnutls-3.8.5/doc/gnutls.info-3
===================================================================
---- gnutls-3.8.4.orig/doc/gnutls.info-3
-+++ gnutls-3.8.4/doc/gnutls.info-3
-@@ -2247,7 +2247,7 @@ to ‘more’. Both will exit with a st
+--- gnutls-3.8.5.orig/doc/gnutls.info-3
++++ gnutls-3.8.5/doc/gnutls.info-3
+@@ -2262,7 +2262,7 @@ to ‘more’. Both will exit with a st
--inline-commands-prefix=str Change the default delimiter for inline commands
--provider=file Specify the PKCS #11 provider library
- file must pre-exist
@@ -452,7 +452,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
--list-config Reports the configuration of the library
--logfile=str Redirect informational messages to a specific file
--keymatexport=str Label used for exporting keying material
-@@ -3400,7 +3400,7 @@ to know what happens inside the black bo
+@@ -3415,7 +3415,7 @@ to know what happens inside the black bo
* TLS Hello Extension Handling::
* Cryptographic Backend::
* Random Number Generators-internals::
@@ -461,7 +461,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
File: gnutls.info, Node: The TLS Protocol, Next: TLS Handshake Protocol, Up: Internal architecture of GnuTLS
-@@ -3932,7 +3932,7 @@ and abstract key types::.
+@@ -3947,7 +3947,7 @@ and abstract key types::.
kernel implementation of ‘/dev/crypto’.
@@ -470,7 +470,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
11.6 Random Number Generators
=============================
-@@ -3942,7 +3942,7 @@ About the generators
+@@ -3957,7 +3957,7 @@ About the generators
GnuTLS provides two random generators. The default, and the AES-DRBG
random generator which is only used when the library is compiled with
@@ -479,7 +479,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
The default generator - inner workings
--------------------------------------
-@@ -4174,7 +4174,7 @@ in *note Figure 11.5: gnutls_fips_mode_t
+@@ -4189,7 +4189,7 @@ in *note Figure 11.5: gnutls_fips_mode_t
Figure 11.5: The ‘gnutls_fips_mode_t’ enumeration.
The intention of this API is to be used by applications which may run in
@@ -488,7 +488,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
set, e.g., for non-security related purposes. In these cases
applications should wrap the non-compliant code within blocks like the
following.
-@@ -4198,10 +4198,10 @@ are macros to simplify the following seq
+@@ -4213,10 +4213,10 @@ are macros to simplify the following seq
The reason of the ‘GNUTLS_FIPS140_SET_MODE_THREAD’ flag in the previous
calls is to localize the change in the mode. Note also, that such a
@@ -501,7 +501,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
gnutls_fips140_set_mode(GNUTLS_FIPS140_LAX, 0);
Service indicator
-@@ -4683,8 +4683,8 @@ There are certifications from national o
+@@ -4698,8 +4698,8 @@ There are certifications from national o
practices, such as unit testing and reliance on well known crypto
primitives.
@@ -512,7 +512,7 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
File: gnutls.info, Node: Error codes, Next: Supported ciphersuites, Prev: Support, Up: Top
-@@ -9152,7 +9152,7 @@ gnutls_fips140_set_mode
+@@ -9169,7 +9169,7 @@ gnutls_fips140_set_mode
-- Function: void gnutls_fips140_set_mode (gnutls_fips_mode_t MODE,
unsigned FLAGS)
@@ -521,10 +521,10 @@ Index: gnutls-3.8.4/doc/gnutls.info-3
FLAGS: should be zero or ‘GNUTLS_FIPS140_SET_MODE_THREAD’
-Index: gnutls-3.8.4/doc/invoke-gnutls-cli.texi
+Index: gnutls-3.8.5/doc/invoke-gnutls-cli.texi
===================================================================
---- gnutls-3.8.4.orig/doc/invoke-gnutls-cli.texi
-+++ gnutls-3.8.4/doc/invoke-gnutls-cli.texi
+--- gnutls-3.8.5.orig/doc/invoke-gnutls-cli.texi
++++ gnutls-3.8.5/doc/invoke-gnutls-cli.texi
@@ -102,7 +102,7 @@ None:
--inline-commands-prefix=str Change the default delimiter for inline commands
--provider=file Specify the PKCS #11 provider library
@@ -534,10 +534,10 @@ Index: gnutls-3.8.4/doc/invoke-gnutls-cli.texi
--list-config Reports the configuration of the library
--logfile=str Redirect informational messages to a specific file
--keymatexport=str Label used for exporting keying material
-Index: gnutls-3.8.4/doc/manpages/gnutls-cli.1
+Index: gnutls-3.8.5/doc/manpages/gnutls-cli.1
===================================================================
---- gnutls-3.8.4.orig/doc/manpages/gnutls-cli.1
-+++ gnutls-3.8.4/doc/manpages/gnutls-cli.1
+--- gnutls-3.8.5.orig/doc/manpages/gnutls-cli.1
++++ gnutls-3.8.5/doc/manpages/gnutls-cli.1
@@ -398,7 +398,7 @@ Specify the PKCS #11 provider library.
This will override the default options in /etc/gnutls/pkcs11.conf
.TP
@@ -547,11 +547,11 @@ Index: gnutls-3.8.4/doc/manpages/gnutls-cli.1
.sp
.TP
.NOP \f\*[B-Font]\-\-list\-config\f[]
-Index: gnutls-3.8.4/doc/reference/html/gnutls-gnutls.html
+Index: gnutls-3.8.5/doc/reference/html/gnutls-gnutls.html
===================================================================
---- gnutls-3.8.4.orig/doc/reference/html/gnutls-gnutls.html
-+++ gnutls-3.8.4/doc/reference/html/gnutls-gnutls.html
-@@ -20866,12 +20866,12 @@ gnutls_fips140_set_mode (
When the flag GNUTLS_FIPS140_SET_MODE_THREAD
is specified
@@ -566,7 +566,7 @@ Index: gnutls-3.8.4/doc/reference/html/gnutls-gnutls.html
values for mode
or to GNUTLS_FIPS140_SELFTESTS
mode, the library
switches to GNUTLS_FIPS140_STRICT
mode.
-@@ -20886,7 +20886,7 @@ switches to mode
@@ -575,7 +575,7 @@ Index: gnutls-3.8.4/doc/reference/html/gnutls-gnutls.html
|
-@@ -25911,7 +25911,7 @@ encryption
+@@ -25915,7 +25915,7 @@ encryption
enum gnutls_fips_mode_t
@@ -584,7 +584,7 @@ Index: gnutls-3.8.4/doc/reference/html/gnutls-gnutls.html