summaryrefslogtreecommitdiffhomepage
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/nettle-3.7.2.local.patch (renamed from patches/libnettle-3.6.local.patch)30
-rw-r--r--patches/nettle/midipix-configure-support.patch (renamed from patches/libnettle/nettle-conf-fix.patch)0
2 files changed, 15 insertions, 15 deletions
diff --git a/patches/libnettle-3.6.local.patch b/patches/nettle-3.7.2.local.patch
index b527661f..87596831 100644
--- a/patches/libnettle-3.6.local.patch
+++ b/patches/nettle-3.7.2.local.patch
@@ -1,3 +1,18 @@
+diff -ru nettle-3.7.2.orig/x86_64/salsa20-2core.asm nettle-3.7.2/x86_64/salsa20-2core.asm
+--- nettle-3.7.2.orig/x86_64/salsa20-2core.asm 2021-03-21 09:32:25.000000000 +0100
++++ nettle-3.7.2/x86_64/salsa20-2core.asm 2021-04-10 14:56:55.970009499 +0200
+@@ -316,3 +316,11 @@
+ W64_EXIT(3, 13)
+ ret
+ EPILOGUE(_nettle_salsa20_2core)
++
++#ifdef __midipix__
++ .section .got$_nettle_salsa20_2core,"r"
++ .global __imp__nettle_salsa20_2core
++__imp__nettle_salsa20_2core:
++ .quad _nettle_salsa20_2core
++ .linkonce discard
++#endif
diff -ru nettle-3.6.orig/x86_64/aes-decrypt-internal.asm nettle-3.6/x86_64/aes-decrypt-internal.asm
--- nettle-3.6.orig/x86_64/aes-decrypt-internal.asm 2020-04-29 20:11:44.000000000 +0200
+++ nettle-3.6/x86_64/aes-decrypt-internal.asm 2020-09-07 13:38:12.793134936 +0200
@@ -264,21 +279,6 @@ diff -ru nettle-3.6.orig/x86_64/salsa20-core-internal.asm nettle-3.6/x86_64/sals
+ .quad _nettle_salsa20_core
+ .linkonce discard
+#endif
-diff -ru nettle-3.6.orig/x86_64/salsa20-crypt.asm nettle-3.6/x86_64/salsa20-crypt.asm
---- nettle-3.6.orig/x86_64/salsa20-crypt.asm 2020-04-29 20:11:44.000000000 +0200
-+++ nettle-3.6/x86_64/salsa20-crypt.asm 2020-09-07 13:54:39.815792126 +0200
-@@ -245,3 +245,11 @@
- ret
-
- EPILOGUE(nettle_salsa20_crypt)
-+
-+#ifdef __midipix__
-+ .section .got$nettle_salsa20_crypt,"r"
-+ .global __imp_nettle_salsa20_crypt
-+__imp_nettle_salsa20_crypt:
-+ .quad nettle_salsa20_crypt
-+ .linkonce discard
-+#endif
diff -ru nettle-3.6.orig/x86_64/serpent-decrypt.asm nettle-3.6/x86_64/serpent-decrypt.asm
--- nettle-3.6.orig/x86_64/serpent-decrypt.asm 2020-04-29 20:11:44.000000000 +0200
+++ nettle-3.6/x86_64/serpent-decrypt.asm 2020-09-07 13:55:28.667790597 +0200
diff --git a/patches/libnettle/nettle-conf-fix.patch b/patches/nettle/midipix-configure-support.patch
index 1e031668..1e031668 100644
--- a/patches/libnettle/nettle-conf-fix.patch
+++ b/patches/nettle/midipix-configure-support.patch