Patch libsodium 1.0.15 signature validation onto 1.0.18

depends/packages/libsodium.mk

@@ -4,11 +4,12 @@ $(package)_download_path=https://download.libsodium.org/libsodium/releases/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
 $(package)_dependencies=
-$(package)_patches=1.0.15-pubkey-validation.diff
+$(package)_patches=1.0.15-pubkey-validation.diff 1.0.15-signature-validation.diff
 $(package)_config_opts=
 
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/1.0.15-pubkey-validation.diff && \
+  patch -p1 < $($(package)_patch_dir)/1.0.15-signature-validation.diff && \
   cd $($(package)_build_subdir); ./autogen.sh
 endef
 

depends/patches/libsodium/1.0.15-signature-validation.diff

@@ -0,0 +1,94 @@
+diff -ur libsodium-1.0.18-orig/src/libsodium/crypto_sign/ed25519/ref10/open.c libsodium-1.0.18/src/libsodium/crypto_sign/ed25519/ref10/open.c
+--- libsodium-1.0.18-orig/src/libsodium/crypto_sign/ed25519/ref10/open.c	2019-05-18 21:32:11.000000000 +0100
++++ libsodium-1.0.18/src/libsodium/crypto_sign/ed25519/ref10/open.c	2020-02-18 00:00:08.544107613 +0000
+@@ -10,6 +10,81 @@
+ #include "private/ed25519_ref10.h"
+ #include "utils.h"
+ 
++#ifndef ED25519_COMPAT
++int
++_crypto_sign_ed25519_small_order(const unsigned char p[32])
++{
++    CRYPTO_ALIGN(16)
++    static const unsigned char blacklist[][32] = {
++        /* 0 (order 4) */
++        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++        /* 1 (order 1) */
++        { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++          0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++        /* 2707385501144840649318225287225658788936804267575313519463743609750303402022
++           (order 8) */
++        { 0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0, 0x45, 0xc3, 0xf4,
++          0x89, 0xf2, 0xef, 0x98, 0xf0, 0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6,
++          0x33, 0x39, 0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05 },
++        /* 55188659117513257062467267217118295137698188065244968500265048394206261417927
++           (order 8) */
++        { 0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f, 0xba, 0x3c, 0x0b,
++          0x76, 0x0d, 0x10, 0x67, 0x0f, 0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39,
++          0xcc, 0xc6, 0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a },
++        /* p-1 (order 2) */
++        { 0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0, 0x45, 0xc3, 0xf4,
++          0x89, 0xf2, 0xef, 0x98, 0xf0, 0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6,
++          0x33, 0x39, 0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85 },
++        /* p (order 4) */
++        { 0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f, 0xba, 0x3c, 0x0b,
++          0x76, 0x0d, 0x10, 0x67, 0x0f, 0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39,
++          0xcc, 0xc6, 0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa },
++        /* p+1 (order 1) */
++        { 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f },
++        /* p+2707385501144840649318225287225658788936804267575313519463743609750303402022
++           (order 8) */
++        { 0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f },
++        /* p+55188659117513257062467267217118295137698188065244968500265048394206261417927
++           (order 8) */
++        { 0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f },
++        /* 2p-1 (order 2) */
++        { 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++        /* 2p (order 4) */
++        { 0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++        /* 2p+1 (order 1) */
++        { 0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
++          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }
++    };
++    size_t        i, j;
++    unsigned char c;
++
++    for (i = 0; i < sizeof blacklist / sizeof blacklist[0]; i++) {
++        c = 0;
++        for (j = 0; j < 32; j++) {
++            c |= p[j] ^ blacklist[i][j];
++        }
++        if (c == 0) {
++            return 1;
++        }
++    }
++    return 0;
++}
++#endif
++
+ int
+ _crypto_sign_ed25519_verify_detached(const unsigned char *sig,
+                                      const unsigned char *m,
+@@ -29,7 +104,7 @@
+     }
+ #else
+     if (sc25519_is_canonical(sig + 32) == 0 ||
+-        ge25519_has_small_order(sig) != 0) {
++        _crypto_sign_ed25519_small_order(sig) != 0) {
+         return -1;
+     }
+     if (ge25519_is_canonical(pk) == 0 ||