summaryrefslogtreecommitdiff
path: root/lib/liboqs/src/sig/dilithium
diff options
context:
space:
mode:
Diffstat (limited to 'lib/liboqs/src/sig/dilithium')
-rw-r--r--lib/liboqs/src/sig/dilithium/Makefile49
-rw-r--r--lib/liboqs/src/sig/dilithium/config.mk12
-rw-r--r--lib/liboqs/src/sig/dilithium/dilithium.gyp36
-rw-r--r--lib/liboqs/src/sig/dilithium/manifest.mn25
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/Makefile49
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/api.h152
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.h44
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.mk12
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/manifest.mn30
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.c98
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.h13
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.c237
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.h38
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/params.h74
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.c911
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.h79
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.c390
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.h93
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/pqcrystals-dilithium_dilithium2_ref.gyp41
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.c69
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.h22
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.c102
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.h19
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.c337
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.h36
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric-shake.c28
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric.h69
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/Makefile49
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/api.h152
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.h44
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.mk12
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/manifest.mn30
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.c98
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.h13
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.c237
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.h38
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/params.h74
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.c911
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.h79
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.c390
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.h93
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/pqcrystals-dilithium_dilithium3_ref.gyp41
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.c69
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.h22
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.c102
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.h19
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.c337
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.h36
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric-shake.c28
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric.h69
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/Makefile49
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/api.h152
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.h44
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.mk12
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/manifest.mn30
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.c98
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.h13
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.c237
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.h38
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/params.h74
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.c911
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.h79
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.c390
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.h93
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/pqcrystals-dilithium_dilithium5_ref.gyp41
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.c69
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.h22
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.c102
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.h19
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.c337
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.h36
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric-shake.c28
-rw-r--r--lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric.h69
-rw-r--r--lib/liboqs/src/sig/dilithium/sig_dilithium.h74
-rw-r--r--lib/liboqs/src/sig/dilithium/sig_dilithium_2.c126
-rw-r--r--lib/liboqs/src/sig/dilithium/sig_dilithium_3.c126
-rw-r--r--lib/liboqs/src/sig/dilithium/sig_dilithium_5.c126
77 files changed, 9403 insertions, 0 deletions
diff --git a/lib/liboqs/src/sig/dilithium/Makefile b/lib/liboqs/src/sig/dilithium/Makefile
new file mode 100644
index 000000000..fe090f3ff
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/Makefile
@@ -0,0 +1,49 @@
+#! gmake
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY). #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL) #
+#######################################################################
+
+USE_GCOV =
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL). #
+#######################################################################
+
+include config.mk
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL) #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL). #
+#######################################################################
+
+WARNING_CFLAGS = $(NULL)
+
diff --git a/lib/liboqs/src/sig/dilithium/config.mk b/lib/liboqs/src/sig/dilithium/config.mk
new file mode 100644
index 000000000..724730264
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/config.mk
@@ -0,0 +1,12 @@
+# DO NOT EDIT: generated from config.mk.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# add fixes for platform integration issues here.
+#
+# liboqs programs expect the public include files to be in oqs/xxxx,
+# So we put liboqs in it's own module, oqs, and point to the dist files
+INCLUDES += -I$(CORE_DEPTH)/lib/liboqs/src/common/pqclean_shims -I$(CORE_DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits
+DEFINES += -DDILITHIUM_MODE=5 -DDILITHIUM_RANDOMIZED_SIGNING
diff --git a/lib/liboqs/src/sig/dilithium/dilithium.gyp b/lib/liboqs/src/sig/dilithium/dilithium.gyp
new file mode 100644
index 000000000..e3a4391de
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/dilithium.gyp
@@ -0,0 +1,36 @@
+# DO NOT EDIT: generated from subdir.gyp.template
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+{
+ 'includes': [
+ '../../../../../coreconf/config.gypi'
+ ],
+ 'targets': [
+ {
+ 'target_name': 'oqs_src_sig_dilithium',
+ 'type': 'static_library',
+ 'sources': [
+ 'sig_dilithium_2.c',
+ 'sig_dilithium_3.c',
+ 'sig_dilithium_5.c',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/exports.gyp:nss_exports'
+ ]
+ }
+ ],
+ 'target_defaults': {
+ 'defines': [
+ 'DILITHIUM_MODE=5',
+ 'DILITHIUM_RANDOMIZED_SIGNING',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/lib/liboqs/src/common/pqclean_shims',
+ '<(DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits',
+ ]
+ },
+ 'variables': {
+ 'module': 'oqs'
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/manifest.mn b/lib/liboqs/src/sig/dilithium/manifest.mn
new file mode 100644
index 000000000..0a2d331ab
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/manifest.mn
@@ -0,0 +1,25 @@
+# DO NOT EDIT: generated from manifest.mn.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CORE_DEPTH = ../../../../..
+
+MODULE = oqs
+
+LIBRARY_NAME = oqs_src_sig_dilithium
+SHARED_LIBRARY = $(NULL)
+
+CSRCS = \
+ sig_dilithium_2.c \
+ sig_dilithium_3.c \
+ sig_dilithium_5.c \
+ $(NULL)
+
+# only add module debugging in opt builds if DEBUG_PKCS11 is set
+ifdef DEBUG_PKCS11
+ DEFINES += -DDEBUG_MODULE
+endif
+
+# This part of the code, including all sub-dirs, can be optimized for size
+export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/Makefile b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/Makefile
new file mode 100644
index 000000000..fe090f3ff
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/Makefile
@@ -0,0 +1,49 @@
+#! gmake
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY). #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL) #
+#######################################################################
+
+USE_GCOV =
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL). #
+#######################################################################
+
+include config.mk
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL) #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL). #
+#######################################################################
+
+WARNING_CFLAGS = $(NULL)
+
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/api.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/api.h
new file mode 100644
index 000000000..ceeef106d
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/api.h
@@ -0,0 +1,152 @@
+#ifndef API_H
+#define API_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define pqcrystals_dilithium2_PUBLICKEYBYTES 1312
+#define pqcrystals_dilithium2_SECRETKEYBYTES 2528
+#define pqcrystals_dilithium2_BYTES 2420
+
+#define pqcrystals_dilithium2_ref_PUBLICKEYBYTES pqcrystals_dilithium2_PUBLICKEYBYTES
+#define pqcrystals_dilithium2_ref_SECRETKEYBYTES pqcrystals_dilithium2_SECRETKEYBYTES
+#define pqcrystals_dilithium2_ref_BYTES pqcrystals_dilithium2_BYTES
+
+int pqcrystals_dilithium2_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium2_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium2_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium2aes_ref_PUBLICKEYBYTES pqcrystals_dilithium2_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium2aes_ref_SECRETKEYBYTES pqcrystals_dilithium2_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium2aes_ref_BYTES pqcrystals_dilithium2_ref_BYTES
+
+int pqcrystals_dilithium2aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium2aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium3_PUBLICKEYBYTES 1952
+#define pqcrystals_dilithium3_SECRETKEYBYTES 4000
+#define pqcrystals_dilithium3_BYTES 3293
+
+#define pqcrystals_dilithium3_ref_PUBLICKEYBYTES pqcrystals_dilithium3_PUBLICKEYBYTES
+#define pqcrystals_dilithium3_ref_SECRETKEYBYTES pqcrystals_dilithium3_SECRETKEYBYTES
+#define pqcrystals_dilithium3_ref_BYTES pqcrystals_dilithium3_BYTES
+
+int pqcrystals_dilithium3_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium3_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium3_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium3aes_ref_PUBLICKEYBYTES pqcrystals_dilithium3_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium3aes_ref_SECRETKEYBYTES pqcrystals_dilithium3_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium3aes_ref_BYTES pqcrystals_dilithium3_ref_BYTES
+
+int pqcrystals_dilithium3aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium3aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium5_PUBLICKEYBYTES 2592
+#define pqcrystals_dilithium5_SECRETKEYBYTES 4864
+#define pqcrystals_dilithium5_BYTES 4595
+
+#define pqcrystals_dilithium5_ref_PUBLICKEYBYTES pqcrystals_dilithium5_PUBLICKEYBYTES
+#define pqcrystals_dilithium5_ref_SECRETKEYBYTES pqcrystals_dilithium5_SECRETKEYBYTES
+#define pqcrystals_dilithium5_ref_BYTES pqcrystals_dilithium5_BYTES
+
+int pqcrystals_dilithium5_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium5_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium5_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium5aes_ref_PUBLICKEYBYTES pqcrystals_dilithium5_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium5aes_ref_SECRETKEYBYTES pqcrystals_dilithium5_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium5aes_ref_BYTES pqcrystals_dilithium5_ref_BYTES
+
+int pqcrystals_dilithium5aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium5aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.h
new file mode 100644
index 000000000..14b08e0f0
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.h
@@ -0,0 +1,44 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+//#define DILITHIUM_MODE 2
+//#define DILITHIUM_USE_AES
+//#define DILITHIUM_RANDOMIZED_SIGNING
+//#define USE_RDPMC
+//#define DBENCH
+
+#ifndef DILITHIUM_MODE
+#define DILITHIUM_MODE 2
+#endif
+
+#ifdef DILITHIUM_USE_AES
+#if DILITHIUM_MODE == 2
+#define CRYPTO_ALGNAME "Dilithium2-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium2aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium2aes_ref_##s
+#elif DILITHIUM_MODE == 3
+#define CRYPTO_ALGNAME "Dilithium3-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium3aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium3aes_ref_##s
+#elif DILITHIUM_MODE == 5
+#define CRYPTO_ALGNAME "Dilithium5-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium5aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium5aes_ref_##s
+#endif
+#else
+#if DILITHIUM_MODE == 2
+#define CRYPTO_ALGNAME "Dilithium2"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium2_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium2_ref_##s
+#elif DILITHIUM_MODE == 3
+#define CRYPTO_ALGNAME "Dilithium3"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium3_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium3_ref_##s
+#elif DILITHIUM_MODE == 5
+#define CRYPTO_ALGNAME "Dilithium5"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium5_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium5_ref_##s
+#endif
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.mk b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.mk
new file mode 100644
index 000000000..5a9d9bd93
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/config.mk
@@ -0,0 +1,12 @@
+# DO NOT EDIT: generated from config.mk.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# add fixes for platform integration issues here.
+#
+# liboqs programs expect the public include files to be in oqs/xxxx,
+# So we put liboqs in it's own module, oqs, and point to the dist files
+INCLUDES += -I$(CORE_DEPTH)/lib/liboqs/src/common/pqclean_shims -I$(CORE_DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits
+DEFINES += -DDILITHIUM_MODE=2 -DDILITHIUM_RANDOMIZED_SIGNING
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/manifest.mn b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/manifest.mn
new file mode 100644
index 000000000..aeefd3cee
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/manifest.mn
@@ -0,0 +1,30 @@
+# DO NOT EDIT: generated from manifest.mn.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CORE_DEPTH = ../../../../../..
+
+MODULE = oqs
+
+LIBRARY_NAME = oqs_src_sig_dilithium_pqcrystals-dilithium_dilithium2_ref
+SHARED_LIBRARY = $(NULL)
+
+CSRCS = \
+ ntt.c \
+ packing.c \
+ poly.c \
+ polyvec.c \
+ reduce.c \
+ rounding.c \
+ sign.c \
+ symmetric-shake.c \
+ $(NULL)
+
+# only add module debugging in opt builds if DEBUG_PKCS11 is set
+ifdef DEBUG_PKCS11
+ DEFINES += -DDEBUG_MODULE
+endif
+
+# This part of the code, including all sub-dirs, can be optimized for size
+export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.c
new file mode 100644
index 000000000..5ea8b530e
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.c
@@ -0,0 +1,98 @@
+#include <stdint.h>
+#include "params.h"
+#include "ntt.h"
+#include "reduce.h"
+
+static const int32_t zetas[N] = {
+ 0, 25847, -2608894, -518909, 237124, -777960, -876248, 466468,
+ 1826347, 2353451, -359251, -2091905, 3119733, -2884855, 3111497, 2680103,
+ 2725464, 1024112, -1079900, 3585928, -549488, -1119584, 2619752, -2108549,
+ -2118186, -3859737, -1399561, -3277672, 1757237, -19422, 4010497, 280005,
+ 2706023, 95776, 3077325, 3530437, -1661693, -3592148, -2537516, 3915439,
+ -3861115, -3043716, 3574422, -2867647, 3539968, -300467, 2348700, -539299,
+ -1699267, -1643818, 3505694, -3821735, 3507263, -2140649, -1600420, 3699596,
+ 811944, 531354, 954230, 3881043, 3900724, -2556880, 2071892, -2797779,
+ -3930395, -1528703, -3677745, -3041255, -1452451, 3475950, 2176455, -1585221,
+ -1257611, 1939314, -4083598, -1000202, -3190144, -3157330, -3632928, 126922,
+ 3412210, -983419, 2147896, 2715295, -2967645, -3693493, -411027, -2477047,
+ -671102, -1228525, -22981, -1308169, -381987, 1349076, 1852771, -1430430,
+ -3343383, 264944, 508951, 3097992, 44288, -1100098, 904516, 3958618,
+ -3724342, -8578, 1653064, -3249728, 2389356, -210977, 759969, -1316856,
+ 189548, -3553272, 3159746, -1851402, -2409325, -177440, 1315589, 1341330,
+ 1285669, -1584928, -812732, -1439742, -3019102, -3881060, -3628969, 3839961,
+ 2091667, 3407706, 2316500, 3817976, -3342478, 2244091, -2446433, -3562462,
+ 266997, 2434439, -1235728, 3513181, -3520352, -3759364, -1197226, -3193378,
+ 900702, 1859098, 909542, 819034, 495491, -1613174, -43260, -522500,
+ -655327, -3122442, 2031748, 3207046, -3556995, -525098, -768622, -3595838,
+ 342297, 286988, -2437823, 4108315, 3437287, -3342277, 1735879, 203044,
+ 2842341, 2691481, -2590150, 1265009, 4055324, 1247620, 2486353, 1595974,
+ -3767016, 1250494, 2635921, -3548272, -2994039, 1869119, 1903435, -1050970,
+ -1333058, 1237275, -3318210, -1430225, -451100, 1312455, 3306115, -1962642,
+ -1279661, 1917081, -2546312, -1374803, 1500165, 777191, 2235880, 3406031,
+ -542412, -2831860, -1671176, -1846953, -2584293, -3724270, 594136, -3776993,
+ -2013608, 2432395, 2454455, -164721, 1957272, 3369112, 185531, -1207385,
+ -3183426, 162844, 1616392, 3014001, 810149, 1652634, -3694233, -1799107,
+ -3038916, 3523897, 3866901, 269760, 2213111, -975884, 1717735, 472078,
+ -426683, 1723600, -1803090, 1910376, -1667432, -1104333, -260646, -3833893,
+ -2939036, -2235985, -420899, -2286327, 183443, -976891, 1612842, -3545687,
+ -554416, 3919660, -48306, -1362209, 3937738, 1400424, -846154, 1976782
+};
+
+/*************************************************
+* Name: ntt
+*
+* Description: Forward NTT, in-place. No modular reduction is performed after
+* additions or subtractions. Output vector is in bitreversed order.
+*
+* Arguments: - uint32_t p[N]: input/output coefficient array
+**************************************************/
+void ntt(int32_t a[N]) {
+ unsigned int len, start, j, k;
+ int32_t zeta, t;
+
+ k = 0;
+ for(len = 128; len > 0; len >>= 1) {
+ for(start = 0; start < N; start = j + len) {
+ zeta = zetas[++k];
+ for(j = start; j < start + len; ++j) {
+ t = montgomery_reduce((int64_t)zeta * a[j + len]);
+ a[j + len] = a[j] - t;
+ a[j] = a[j] + t;
+ }
+ }
+ }
+}
+
+/*************************************************
+* Name: invntt_tomont
+*
+* Description: Inverse NTT and multiplication by Montgomery factor 2^32.
+* In-place. No modular reductions after additions or
+* subtractions; input coefficients need to be smaller than
+* Q in absolute value. Output coefficient are smaller than Q in
+* absolute value.
+*
+* Arguments: - uint32_t p[N]: input/output coefficient array
+**************************************************/
+void invntt_tomont(int32_t a[N]) {
+ unsigned int start, len, j, k;
+ int32_t t, zeta;
+ const int32_t f = 41978; // mont^2/256
+
+ k = 256;
+ for(len = 1; len < N; len <<= 1) {
+ for(start = 0; start < N; start = j + len) {
+ zeta = -zetas[--k];
+ for(j = start; j < start + len; ++j) {
+ t = a[j];
+ a[j] = t + a[j + len];
+ a[j + len] = t - a[j + len];
+ a[j + len] = montgomery_reduce((int64_t)zeta * a[j + len]);
+ }
+ }
+ }
+
+ for(j = 0; j < N; ++j) {
+ a[j] = montgomery_reduce((int64_t)f * a[j]);
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.h
new file mode 100644
index 000000000..731132d5c
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/ntt.h
@@ -0,0 +1,13 @@
+#ifndef NTT_H
+#define NTT_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define ntt DILITHIUM_NAMESPACE(ntt)
+void ntt(int32_t a[N]);
+
+#define invntt_tomont DILITHIUM_NAMESPACE(invntt_tomont)
+void invntt_tomont(int32_t a[N]);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.c
new file mode 100644
index 000000000..9de5826cd
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.c
@@ -0,0 +1,237 @@
+#include "params.h"
+#include "packing.h"
+#include "polyvec.h"
+#include "poly.h"
+
+/*************************************************
+* Name: pack_pk
+*
+* Description: Bit-pack public key pk = (rho, t1).
+*
+* Arguments: - uint8_t pk[]: output byte array
+* - const uint8_t rho[]: byte array containing rho
+* - const polyveck *t1: pointer to vector t1
+**************************************************/
+void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const polyveck *t1)
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ pk[i] = rho[i];
+ pk += SEEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt1_pack(pk + i*POLYT1_PACKEDBYTES, &t1->vec[i]);
+}
+
+/*************************************************
+* Name: unpack_pk
+*
+* Description: Unpack public key pk = (rho, t1).
+*
+* Arguments: - const uint8_t rho[]: output byte array for rho
+* - const polyveck *t1: pointer to output vector t1
+* - uint8_t pk[]: byte array containing bit-packed pk
+**************************************************/
+void unpack_pk(uint8_t rho[SEEDBYTES],
+ polyveck *t1,
+ const uint8_t pk[CRYPTO_PUBLICKEYBYTES])
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ rho[i] = pk[i];
+ pk += SEEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt1_unpack(&t1->vec[i], pk + i*POLYT1_PACKEDBYTES);
+}
+
+/*************************************************
+* Name: pack_sk
+*
+* Description: Bit-pack secret key sk = (rho, tr, key, t0, s1, s2).
+*
+* Arguments: - uint8_t sk[]: output byte array
+* - const uint8_t rho[]: byte array containing rho
+* - const uint8_t tr[]: byte array containing tr
+* - const uint8_t key[]: byte array containing key
+* - const polyveck *t0: pointer to vector t0
+* - const polyvecl *s1: pointer to vector s1
+* - const polyveck *s2: pointer to vector s2
+**************************************************/
+void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const uint8_t tr[SEEDBYTES],
+ const uint8_t key[SEEDBYTES],
+ const polyveck *t0,
+ const polyvecl *s1,
+ const polyveck *s2)
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = rho[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = key[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = tr[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyeta_pack(sk + i*POLYETA_PACKEDBYTES, &s1->vec[i]);
+ sk += L*POLYETA_PACKEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyeta_pack(sk + i*POLYETA_PACKEDBYTES, &s2->vec[i]);
+ sk += K*POLYETA_PACKEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt0_pack(sk + i*POLYT0_PACKEDBYTES, &t0->vec[i]);
+}
+
+/*************************************************
+* Name: unpack_sk
+*
+* Description: Unpack secret key sk = (rho, tr, key, t0, s1, s2).
+*
+* Arguments: - const uint8_t rho[]: output byte array for rho
+* - const uint8_t tr[]: output byte array for tr
+* - const uint8_t key[]: output byte array for key
+* - const polyveck *t0: pointer to output vector t0
+* - const polyvecl *s1: pointer to output vector s1
+* - const polyveck *s2: pointer to output vector s2
+* - uint8_t sk[]: byte array containing bit-packed sk
+**************************************************/
+void unpack_sk(uint8_t rho[SEEDBYTES],
+ uint8_t tr[SEEDBYTES],
+ uint8_t key[SEEDBYTES],
+ polyveck *t0,
+ polyvecl *s1,
+ polyveck *s2,
+ const uint8_t sk[CRYPTO_SECRETKEYBYTES])
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ rho[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ key[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ tr[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i=0; i < L; ++i)
+ polyeta_unpack(&s1->vec[i], sk + i*POLYETA_PACKEDBYTES);
+ sk += L*POLYETA_PACKEDBYTES;
+
+ for(i=0; i < K; ++i)
+ polyeta_unpack(&s2->vec[i], sk + i*POLYETA_PACKEDBYTES);
+ sk += K*POLYETA_PACKEDBYTES;
+
+ for(i=0; i < K; ++i)
+ polyt0_unpack(&t0->vec[i], sk + i*POLYT0_PACKEDBYTES);
+}
+
+/*************************************************
+* Name: pack_sig
+*
+* Description: Bit-pack signature sig = (c, z, h).
+*
+* Arguments: - uint8_t sig[]: output byte array
+* - const uint8_t *c: pointer to challenge hash length SEEDBYTES
+* - const polyvecl *z: pointer to vector z
+* - const polyveck *h: pointer to hint vector h
+**************************************************/
+void pack_sig(uint8_t sig[CRYPTO_BYTES],
+ const uint8_t c[SEEDBYTES],
+ const polyvecl *z,
+ const polyveck *h)
+{
+ unsigned int i, j, k;
+
+ for(i=0; i < SEEDBYTES; ++i)
+ sig[i] = c[i];
+ sig += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyz_pack(sig + i*POLYZ_PACKEDBYTES, &z->vec[i]);
+ sig += L*POLYZ_PACKEDBYTES;
+
+ /* Encode h */
+ for(i = 0; i < OMEGA + K; ++i)
+ sig[i] = 0;
+
+ k = 0;
+ for(i = 0; i < K; ++i) {
+ for(j = 0; j < N; ++j)
+ if(h->vec[i].coeffs[j] != 0)
+ sig[k++] = j;
+
+ sig[OMEGA + i] = k;
+ }
+}
+
+/*************************************************
+* Name: unpack_sig
+*
+* Description: Unpack signature sig = (c, z, h).
+*
+* Arguments: - uint8_t *c: pointer to output challenge hash
+* - polyvecl *z: pointer to output vector z
+* - polyveck *h: pointer to output hint vector h
+* - const uint8_t sig[]: byte array containing
+* bit-packed signature
+*
+* Returns 1 in case of malformed signature; otherwise 0.
+**************************************************/
+int unpack_sig(uint8_t c[SEEDBYTES],
+ polyvecl *z,
+ polyveck *h,
+ const uint8_t sig[CRYPTO_BYTES])
+{
+ unsigned int i, j, k;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ c[i] = sig[i];
+ sig += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyz_unpack(&z->vec[i], sig + i*POLYZ_PACKEDBYTES);
+ sig += L*POLYZ_PACKEDBYTES;
+
+ /* Decode h */
+ k = 0;
+ for(i = 0; i < K; ++i) {
+ for(j = 0; j < N; ++j)
+ h->vec[i].coeffs[j] = 0;
+
+ if(sig[OMEGA + i] < k || sig[OMEGA + i] > OMEGA)
+ return 1;
+
+ for(j = k; j < sig[OMEGA + i]; ++j) {
+ /* Coefficients are ordered for strong unforgeability */
+ if(j > k && sig[j] <= sig[j-1]) return 1;
+ h->vec[i].coeffs[sig[j]] = 1;
+ }
+
+ k = sig[OMEGA + i];
+ }
+
+ /* Extra indices are zero for strong unforgeability */
+ for(j = k; j < OMEGA; ++j)
+ if(sig[j])
+ return 1;
+
+ return 0;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.h
new file mode 100644
index 000000000..7c7cb6f4c
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/packing.h
@@ -0,0 +1,38 @@
+#ifndef PACKING_H
+#define PACKING_H
+
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+
+#define pack_pk DILITHIUM_NAMESPACE(pack_pk)
+void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES], const uint8_t rho[SEEDBYTES], const polyveck *t1);
+
+#define pack_sk DILITHIUM_NAMESPACE(pack_sk)
+void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const uint8_t tr[SEEDBYTES],
+ const uint8_t key[SEEDBYTES],
+ const polyveck *t0,
+ const polyvecl *s1,
+ const polyveck *s2);
+
+#define pack_sig DILITHIUM_NAMESPACE(pack_sig)
+void pack_sig(uint8_t sig[CRYPTO_BYTES], const uint8_t c[SEEDBYTES], const polyvecl *z, const polyveck *h);
+
+#define unpack_pk DILITHIUM_NAMESPACE(unpack_pk)
+void unpack_pk(uint8_t rho[SEEDBYTES], polyveck *t1, const uint8_t pk[CRYPTO_PUBLICKEYBYTES]);
+
+#define unpack_sk DILITHIUM_NAMESPACE(unpack_sk)
+void unpack_sk(uint8_t rho[SEEDBYTES],
+ uint8_t tr[SEEDBYTES],
+ uint8_t key[SEEDBYTES],
+ polyveck *t0,
+ polyvecl *s1,
+ polyveck *s2,
+ const uint8_t sk[CRYPTO_SECRETKEYBYTES]);
+
+#define unpack_sig DILITHIUM_NAMESPACE(unpack_sig)
+int unpack_sig(uint8_t c[SEEDBYTES], polyvecl *z, polyveck *h, const uint8_t sig[CRYPTO_BYTES]);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/params.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/params.h
new file mode 100644
index 000000000..63b02e2db
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/params.h
@@ -0,0 +1,74 @@
+#ifndef PARAMS_H
+#define PARAMS_H
+
+#include "config.h"
+
+#define SEEDBYTES 32
+#define CRHBYTES 64
+#define N 256
+#define Q 8380417
+#define D 13
+#define ROOT_OF_UNITY 1753
+
+#if DILITHIUM_MODE == 2
+#define K 4
+#define L 4
+#define ETA 2
+#define TAU 39
+#define BETA 78
+#define GAMMA1 (1 << 17)
+#define GAMMA2 ((Q-1)/88)
+#define OMEGA 80
+
+#elif DILITHIUM_MODE == 3
+#define K 6
+#define L 5
+#define ETA 4
+#define TAU 49
+#define BETA 196
+#define GAMMA1 (1 << 19)
+#define GAMMA2 ((Q-1)/32)
+#define OMEGA 55
+
+#elif DILITHIUM_MODE == 5
+#define K 8
+#define L 7
+#define ETA 2
+#define TAU 60
+#define BETA 120
+#define GAMMA1 (1 << 19)
+#define GAMMA2 ((Q-1)/32)
+#define OMEGA 75
+
+#endif
+
+#define POLYT1_PACKEDBYTES 320
+#define POLYT0_PACKEDBYTES 416
+#define POLYVECH_PACKEDBYTES (OMEGA + K)
+
+#if GAMMA1 == (1 << 17)
+#define POLYZ_PACKEDBYTES 576
+#elif GAMMA1 == (1 << 19)
+#define POLYZ_PACKEDBYTES 640
+#endif
+
+#if GAMMA2 == (Q-1)/88
+#define POLYW1_PACKEDBYTES 192
+#elif GAMMA2 == (Q-1)/32
+#define POLYW1_PACKEDBYTES 128
+#endif
+
+#if ETA == 2
+#define POLYETA_PACKEDBYTES 96
+#elif ETA == 4
+#define POLYETA_PACKEDBYTES 128
+#endif
+
+#define CRYPTO_PUBLICKEYBYTES (SEEDBYTES + K*POLYT1_PACKEDBYTES)
+#define CRYPTO_SECRETKEYBYTES (3*SEEDBYTES \
+ + L*POLYETA_PACKEDBYTES \
+ + K*POLYETA_PACKEDBYTES \
+ + K*POLYT0_PACKEDBYTES)
+#define CRYPTO_BYTES (SEEDBYTES + L*POLYZ_PACKEDBYTES + POLYVECH_PACKEDBYTES)
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.c
new file mode 100644
index 000000000..006e83c93
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.c
@@ -0,0 +1,911 @@
+#include <stdint.h>
+#include "params.h"
+#include "poly.h"
+#include "ntt.h"
+#include "reduce.h"
+#include "rounding.h"
+#include "symmetric.h"
+
+#ifdef DBENCH
+#include "test/cpucycles.h"
+extern const uint64_t timing_overhead;
+extern uint64_t *tred, *tadd, *tmul, *tround, *tsample, *tpack;
+#define DBENCH_START() uint64_t time = cpucycles()
+#define DBENCH_STOP(t) t += cpucycles() - time - timing_overhead
+#else
+#define DBENCH_START()
+#define DBENCH_STOP(t)
+#endif
+
+/*************************************************
+* Name: poly_reduce
+*
+* Description: Inplace reduction of all coefficients of polynomial to
+* representative in [-6283009,6283007].
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_reduce(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] = reduce32(a->coeffs[i]);
+
+ DBENCH_STOP(*tred);
+}
+
+/*************************************************
+* Name: poly_caddq
+*
+* Description: For all coefficients of in/out polynomial add Q if
+* coefficient is negative.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_caddq(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] = caddq(a->coeffs[i]);
+
+ DBENCH_STOP(*tred);
+}
+
+/*************************************************
+* Name: poly_add
+*
+* Description: Add polynomials. No modular reduction is performed.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first summand
+* - const poly *b: pointer to second summand
+**************************************************/
+void poly_add(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = a->coeffs[i] + b->coeffs[i];
+
+ DBENCH_STOP(*tadd);
+}
+
+/*************************************************
+* Name: poly_sub
+*
+* Description: Subtract polynomials. No modular reduction is
+* performed.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first input polynomial
+* - const poly *b: pointer to second input polynomial to be
+* subtraced from first input polynomial
+**************************************************/
+void poly_sub(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = a->coeffs[i] - b->coeffs[i];
+
+ DBENCH_STOP(*tadd);
+}
+
+/*************************************************
+* Name: poly_shiftl
+*
+* Description: Multiply polynomial by 2^D without modular reduction. Assumes
+* input coefficients to be less than 2^{31-D} in absolute value.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_shiftl(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] <<= D;
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_ntt
+*
+* Description: Inplace forward NTT. Coefficients can grow by
+* 8*Q in absolute value.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_ntt(poly *a) {
+ DBENCH_START();
+
+ ntt(a->coeffs);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_invntt_tomont
+*
+* Description: Inplace inverse NTT and multiplication by 2^{32}.
+* Input coefficients need to be less than Q in absolute
+* value and output coefficients are again bounded by Q.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_invntt_tomont(poly *a) {
+ DBENCH_START();
+
+ invntt_tomont(a->coeffs);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_pointwise_montgomery
+*
+* Description: Pointwise multiplication of polynomials in NTT domain
+* representation and multiplication of resulting polynomial
+* by 2^{-32}.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first input polynomial
+* - const poly *b: pointer to second input polynomial
+**************************************************/
+void poly_pointwise_montgomery(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = montgomery_reduce((int64_t)a->coeffs[i] * b->coeffs[i]);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_power2round
+*
+* Description: For all coefficients c of the input polynomial,
+* compute c0, c1 such that c mod Q = c1*2^D + c0
+* with -2^{D-1} < c0 <= 2^{D-1}. Assumes coefficients to be
+* standard representatives.
+*
+* Arguments: - poly *a1: pointer to output polynomial with coefficients c1
+* - poly *a0: pointer to output polynomial with coefficients c0
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void poly_power2round(poly *a1, poly *a0, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a1->coeffs[i] = power2round(&a0->coeffs[i], a->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_decompose
+*
+* Description: For all coefficients c of the input polynomial,
+* compute high and low bits c0, c1 such c mod Q = c1*ALPHA + c0
+* with -ALPHA/2 < c0 <= ALPHA/2 except c1 = (Q-1)/ALPHA where we
+* set c1 = 0 and -ALPHA/2 <= c0 = c mod Q - Q < 0.
+* Assumes coefficients to be standard representatives.
+*
+* Arguments: - poly *a1: pointer to output polynomial with coefficients c1
+* - poly *a0: pointer to output polynomial with coefficients c0
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void poly_decompose(poly *a1, poly *a0, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a1->coeffs[i] = decompose(&a0->coeffs[i], a->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_make_hint
+*
+* Description: Compute hint polynomial. The coefficients of which indicate
+* whether the low bits of the corresponding coefficient of
+* the input polynomial overflow into the high bits.
+*
+* Arguments: - poly *h: pointer to output hint polynomial
+* - const poly *a0: pointer to low part of input polynomial
+* - const poly *a1: pointer to high part of input polynomial
+*
+* Returns number of 1 bits.
+**************************************************/
+unsigned int poly_make_hint(poly *h, const poly *a0, const poly *a1) {
+ unsigned int i, s = 0;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i) {
+ h->coeffs[i] = make_hint(a0->coeffs[i], a1->coeffs[i]);
+ s += h->coeffs[i];
+ }
+
+ DBENCH_STOP(*tround);
+ return s;
+}
+
+/*************************************************
+* Name: poly_use_hint
+*
+* Description: Use hint polynomial to correct the high bits of a polynomial.
+*
+* Arguments: - poly *b: pointer to output polynomial with corrected high bits
+* - const poly *a: pointer to input polynomial
+* - const poly *h: pointer to input hint polynomial
+**************************************************/
+void poly_use_hint(poly *b, const poly *a, const poly *h) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ b->coeffs[i] = use_hint(a->coeffs[i], h->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_chknorm
+*
+* Description: Check infinity norm of polynomial against given bound.
+* Assumes input coefficients were reduced by reduce32().
+*
+* Arguments: - const poly *a: pointer to polynomial
+* - int32_t B: norm bound
+*
+* Returns 0 if norm is strictly smaller than B <= (Q-1)/8 and 1 otherwise.
+**************************************************/
+int poly_chknorm(const poly *a, int32_t B) {
+ unsigned int i;
+ int32_t t;
+ DBENCH_START();
+
+ if(B > (Q-1)/8)
+ return 1;
+
+ /* It is ok to leak which coefficient violates the bound since
+ the probability for each coefficient is independent of secret
+ data but we must not leak the sign of the centralized representative. */
+ for(i = 0; i < N; ++i) {
+ /* Absolute value */
+ t = a->coeffs[i] >> 31;
+ t = a->coeffs[i] - (t & 2*a->coeffs[i]);
+
+ if(t >= B) {
+ DBENCH_STOP(*tsample);
+ return 1;
+ }
+ }
+
+ DBENCH_STOP(*tsample);
+ return 0;
+}
+
+/*************************************************
+* Name: rej_uniform
+*
+* Description: Sample uniformly random coefficients in [0, Q-1] by
+* performing rejection sampling on array of random bytes.
+*
+* Arguments: - int32_t *a: pointer to output array (allocated)
+* - unsigned int len: number of coefficients to be sampled
+* - const uint8_t *buf: array of random bytes
+* - unsigned int buflen: length of array of random bytes
+*
+* Returns number of sampled coefficients. Can be smaller than len if not enough
+* random bytes were given.
+**************************************************/
+static unsigned int rej_uniform(int32_t *a,
+ unsigned int len,
+ const uint8_t *buf,
+ unsigned int buflen)
+{
+ unsigned int ctr, pos;
+ uint32_t t;
+ DBENCH_START();
+
+ ctr = pos = 0;
+ while(ctr < len && pos + 3 <= buflen) {
+ t = buf[pos++];
+ t |= (uint32_t)buf[pos++] << 8;
+ t |= (uint32_t)buf[pos++] << 16;
+ t &= 0x7FFFFF;
+
+ if(t < Q)
+ a[ctr++] = t;
+ }
+
+ DBENCH_STOP(*tsample);
+ return ctr;
+}
+
+/*************************************************
+* Name: poly_uniform
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [0,Q-1] by performing rejection sampling on the
+* output stream of SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length SEEDBYTES
+* - uint16_t nonce: 2-byte nonce
+**************************************************/
+#define POLY_UNIFORM_NBLOCKS ((768 + STREAM128_BLOCKBYTES - 1)/STREAM128_BLOCKBYTES)
+void poly_uniform(poly *a,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce)
+{
+ unsigned int i, ctr, off;
+ unsigned int buflen = POLY_UNIFORM_NBLOCKS*STREAM128_BLOCKBYTES;
+ uint8_t buf[POLY_UNIFORM_NBLOCKS*STREAM128_BLOCKBYTES + 2];
+ stream128_state state;
+
+ stream128_init(&state, seed, nonce);
+ stream128_squeezeblocks(buf, POLY_UNIFORM_NBLOCKS, &state);
+
+ ctr = rej_uniform(a->coeffs, N, buf, buflen);
+
+ while(ctr < N) {
+ off = buflen % 3;
+ for(i = 0; i < off; ++i)
+ buf[i] = buf[buflen - off + i];
+
+ stream128_squeezeblocks(buf + off, 1, &state);
+ buflen = STREAM128_BLOCKBYTES + off;
+ ctr += rej_uniform(a->coeffs + ctr, N - ctr, buf, buflen);
+ }
+ stream128_release(&state);
+}
+
+/*************************************************
+* Name: rej_eta
+*
+* Description: Sample uniformly random coefficients in [-ETA, ETA] by
+* performing rejection sampling on array of random bytes.
+*
+* Arguments: - int32_t *a: pointer to output array (allocated)
+* - unsigned int len: number of coefficients to be sampled
+* - const uint8_t *buf: array of random bytes
+* - unsigned int buflen: length of array of random bytes
+*
+* Returns number of sampled coefficients. Can be smaller than len if not enough
+* random bytes were given.
+**************************************************/
+static unsigned int rej_eta(int32_t *a,
+ unsigned int len,
+ const uint8_t *buf,
+ unsigned int buflen)
+{
+ unsigned int ctr, pos;
+ uint32_t t0, t1;
+ DBENCH_START();
+
+ ctr = pos = 0;
+ while(ctr < len && pos < buflen) {
+ t0 = buf[pos] & 0x0F;
+ t1 = buf[pos++] >> 4;
+
+#if ETA == 2
+ if(t0 < 15) {
+ t0 = t0 - (205*t0 >> 10)*5;
+ a[ctr++] = 2 - t0;
+ }
+ if(t1 < 15 && ctr < len) {
+ t1 = t1 - (205*t1 >> 10)*5;
+ a[ctr++] = 2 - t1;
+ }
+#elif ETA == 4
+ if(t0 < 9)
+ a[ctr++] = 4 - t0;
+ if(t1 < 9 && ctr < len)
+ a[ctr++] = 4 - t1;
+#endif
+ }
+
+ DBENCH_STOP(*tsample);
+ return ctr;
+}
+
+/*************************************************
+* Name: poly_uniform_eta
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [-ETA,ETA] by performing rejection sampling on the
+* output stream from SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length CRHBYTES
+* - uint16_t nonce: 2-byte nonce
+**************************************************/
+#if ETA == 2
+#define POLY_UNIFORM_ETA_NBLOCKS ((136 + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+#elif ETA == 4
+#define POLY_UNIFORM_ETA_NBLOCKS ((227 + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+#endif
+void poly_uniform_eta(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce)
+{
+ unsigned int ctr;
+ unsigned int buflen = POLY_UNIFORM_ETA_NBLOCKS*STREAM256_BLOCKBYTES;
+ uint8_t buf[POLY_UNIFORM_ETA_NBLOCKS*STREAM256_BLOCKBYTES];
+ stream256_state state;
+
+ stream256_init(&state, seed, nonce);
+ stream256_squeezeblocks(buf, POLY_UNIFORM_ETA_NBLOCKS, &state);
+
+ ctr = rej_eta(a->coeffs, N, buf, buflen);
+
+ while(ctr < N) {
+ stream256_squeezeblocks(buf, 1, &state);
+ ctr += rej_eta(a->coeffs + ctr, N - ctr, buf, STREAM256_BLOCKBYTES);
+ }
+ stream256_release(&state);
+}
+
+/*************************************************
+* Name: poly_uniform_gamma1m1
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [-(GAMMA1 - 1), GAMMA1] by unpacking output stream
+* of SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length CRHBYTES
+* - uint16_t nonce: 16-bit nonce
+**************************************************/
+#define POLY_UNIFORM_GAMMA1_NBLOCKS ((POLYZ_PACKEDBYTES + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+void poly_uniform_gamma1(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce)
+{
+ uint8_t buf[POLY_UNIFORM_GAMMA1_NBLOCKS*STREAM256_BLOCKBYTES];
+ stream256_state state;
+
+ stream256_init(&state, seed, nonce);
+ stream256_squeezeblocks(buf, POLY_UNIFORM_GAMMA1_NBLOCKS, &state);
+ stream256_release(&state);
+ polyz_unpack(a, buf);
+}
+
+/*************************************************
+* Name: challenge
+*
+* Description: Implementation of H. Samples polynomial with TAU nonzero
+* coefficients in {-1,1} using the output stream of
+* SHAKE256(seed).
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const uint8_t mu[]: byte array containing seed of length SEEDBYTES
+**************************************************/
+void poly_challenge(poly *c, const uint8_t seed[SEEDBYTES]) {
+ unsigned int i, b, pos;
+ uint64_t signs;
+ uint8_t buf[SHAKE256_RATE];
+ shake256incctx state;
+
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, seed, SEEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_squeezeblocks(buf, 1, &state);
+
+ signs = 0;
+ for(i = 0; i < 8; ++i)
+ signs |= (uint64_t)buf[i] << 8*i;
+ pos = 8;
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = 0;
+ for(i = N-TAU; i < N; ++i) {
+ do {
+ if(pos >= SHAKE256_RATE) {
+ shake256_squeezeblocks(buf, 1, &state);
+ pos = 0;
+ }
+
+ b = buf[pos++];
+ } while(b > i);
+
+ c->coeffs[i] = c->coeffs[b];
+ c->coeffs[b] = 1 - 2*(signs & 1);
+ signs >>= 1;
+ }
+ shake256_inc_ctx_release(&state);
+}
+
+/*************************************************
+* Name: polyeta_pack
+*
+* Description: Bit-pack polynomial with coefficients in [-ETA,ETA].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYETA_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyeta_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint8_t t[8];
+ DBENCH_START();
+
+#if ETA == 2
+ for(i = 0; i < N/8; ++i) {
+ t[0] = ETA - a->coeffs[8*i+0];
+ t[1] = ETA - a->coeffs[8*i+1];
+ t[2] = ETA - a->coeffs[8*i+2];
+ t[3] = ETA - a->coeffs[8*i+3];
+ t[4] = ETA - a->coeffs[8*i+4];
+ t[5] = ETA - a->coeffs[8*i+5];
+ t[6] = ETA - a->coeffs[8*i+6];
+ t[7] = ETA - a->coeffs[8*i+7];
+
+ r[3*i+0] = (t[0] >> 0) | (t[1] << 3) | (t[2] << 6);
+ r[3*i+1] = (t[2] >> 2) | (t[3] << 1) | (t[4] << 4) | (t[5] << 7);
+ r[3*i+2] = (t[5] >> 1) | (t[6] << 2) | (t[7] << 5);
+ }
+#elif ETA == 4
+ for(i = 0; i < N/2; ++i) {
+ t[0] = ETA - a->coeffs[2*i+0];
+ t[1] = ETA - a->coeffs[2*i+1];
+ r[i] = t[0] | (t[1] << 4);
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyeta_unpack
+*
+* Description: Unpack polynomial with coefficients in [-ETA,ETA].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyeta_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if ETA == 2
+ for(i = 0; i < N/8; ++i) {
+ r->coeffs[8*i+0] = (a[3*i+0] >> 0) & 7;
+ r->coeffs[8*i+1] = (a[3*i+0] >> 3) & 7;
+ r->coeffs[8*i+2] = ((a[3*i+0] >> 6) | (a[3*i+1] << 2)) & 7;
+ r->coeffs[8*i+3] = (a[3*i+1] >> 1) & 7;
+ r->coeffs[8*i+4] = (a[3*i+1] >> 4) & 7;
+ r->coeffs[8*i+5] = ((a[3*i+1] >> 7) | (a[3*i+2] << 1)) & 7;
+ r->coeffs[8*i+6] = (a[3*i+2] >> 2) & 7;
+ r->coeffs[8*i+7] = (a[3*i+2] >> 5) & 7;
+
+ r->coeffs[8*i+0] = ETA - r->coeffs[8*i+0];
+ r->coeffs[8*i+1] = ETA - r->coeffs[8*i+1];
+ r->coeffs[8*i+2] = ETA - r->coeffs[8*i+2];
+ r->coeffs[8*i+3] = ETA - r->coeffs[8*i+3];
+ r->coeffs[8*i+4] = ETA - r->coeffs[8*i+4];
+ r->coeffs[8*i+5] = ETA - r->coeffs[8*i+5];
+ r->coeffs[8*i+6] = ETA - r->coeffs[8*i+6];
+ r->coeffs[8*i+7] = ETA - r->coeffs[8*i+7];
+ }
+#elif ETA == 4
+ for(i = 0; i < N/2; ++i) {
+ r->coeffs[2*i+0] = a[i] & 0x0F;
+ r->coeffs[2*i+1] = a[i] >> 4;
+ r->coeffs[2*i+0] = ETA - r->coeffs[2*i+0];
+ r->coeffs[2*i+1] = ETA - r->coeffs[2*i+1];
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt1_pack
+*
+* Description: Bit-pack polynomial t1 with coefficients fitting in 10 bits.
+* Input coefficients are assumed to be standard representatives.
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYT1_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyt1_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/4; ++i) {
+ r[5*i+0] = (a->coeffs[4*i+0] >> 0);
+ r[5*i+1] = (a->coeffs[4*i+0] >> 8) | (a->coeffs[4*i+1] << 2);
+ r[5*i+2] = (a->coeffs[4*i+1] >> 6) | (a->coeffs[4*i+2] << 4);
+ r[5*i+3] = (a->coeffs[4*i+2] >> 4) | (a->coeffs[4*i+3] << 6);
+ r[5*i+4] = (a->coeffs[4*i+3] >> 2);
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt1_unpack
+*
+* Description: Unpack polynomial t1 with 10-bit coefficients.
+* Output coefficients are standard representatives.
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyt1_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/4; ++i) {
+ r->coeffs[4*i+0] = ((a[5*i+0] >> 0) | ((uint32_t)a[5*i+1] << 8)) & 0x3FF;
+ r->coeffs[4*i+1] = ((a[5*i+1] >> 2) | ((uint32_t)a[5*i+2] << 6)) & 0x3FF;
+ r->coeffs[4*i+2] = ((a[5*i+2] >> 4) | ((uint32_t)a[5*i+3] << 4)) & 0x3FF;
+ r->coeffs[4*i+3] = ((a[5*i+3] >> 6) | ((uint32_t)a[5*i+4] << 2)) & 0x3FF;
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt0_pack
+*
+* Description: Bit-pack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYT0_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyt0_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint32_t t[8];
+ DBENCH_START();
+
+ for(i = 0; i < N/8; ++i) {
+ t[0] = (1 << (D-1)) - a->coeffs[8*i+0];
+ t[1] = (1 << (D-1)) - a->coeffs[8*i+1];
+ t[2] = (1 << (D-1)) - a->coeffs[8*i+2];
+ t[3] = (1 << (D-1)) - a->coeffs[8*i+3];
+ t[4] = (1 << (D-1)) - a->coeffs[8*i+4];
+ t[5] = (1 << (D-1)) - a->coeffs[8*i+5];
+ t[6] = (1 << (D-1)) - a->coeffs[8*i+6];
+ t[7] = (1 << (D-1)) - a->coeffs[8*i+7];
+
+ r[13*i+ 0] = t[0];
+ r[13*i+ 1] = t[0] >> 8;
+ r[13*i+ 1] |= t[1] << 5;
+ r[13*i+ 2] = t[1] >> 3;
+ r[13*i+ 3] = t[1] >> 11;
+ r[13*i+ 3] |= t[2] << 2;
+ r[13*i+ 4] = t[2] >> 6;
+ r[13*i+ 4] |= t[3] << 7;
+ r[13*i+ 5] = t[3] >> 1;
+ r[13*i+ 6] = t[3] >> 9;
+ r[13*i+ 6] |= t[4] << 4;
+ r[13*i+ 7] = t[4] >> 4;
+ r[13*i+ 8] = t[4] >> 12;
+ r[13*i+ 8] |= t[5] << 1;
+ r[13*i+ 9] = t[5] >> 7;
+ r[13*i+ 9] |= t[6] << 6;
+ r[13*i+10] = t[6] >> 2;
+ r[13*i+11] = t[6] >> 10;
+ r[13*i+11] |= t[7] << 3;
+ r[13*i+12] = t[7] >> 5;
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt0_unpack
+*
+* Description: Unpack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyt0_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/8; ++i) {
+ r->coeffs[8*i+0] = a[13*i+0];
+ r->coeffs[8*i+0] |= (uint32_t)a[13*i+1] << 8;
+ r->coeffs[8*i+0] &= 0x1FFF;
+
+ r->coeffs[8*i+1] = a[13*i+1] >> 5;
+ r->coeffs[8*i+1] |= (uint32_t)a[13*i+2] << 3;
+ r->coeffs[8*i+1] |= (uint32_t)a[13*i+3] << 11;
+ r->coeffs[8*i+1] &= 0x1FFF;
+
+ r->coeffs[8*i+2] = a[13*i+3] >> 2;
+ r->coeffs[8*i+2] |= (uint32_t)a[13*i+4] << 6;
+ r->coeffs[8*i+2] &= 0x1FFF;
+
+ r->coeffs[8*i+3] = a[13*i+4] >> 7;
+ r->coeffs[8*i+3] |= (uint32_t)a[13*i+5] << 1;
+ r->coeffs[8*i+3] |= (uint32_t)a[13*i+6] << 9;
+ r->coeffs[8*i+3] &= 0x1FFF;
+
+ r->coeffs[8*i+4] = a[13*i+6] >> 4;
+ r->coeffs[8*i+4] |= (uint32_t)a[13*i+7] << 4;
+ r->coeffs[8*i+4] |= (uint32_t)a[13*i+8] << 12;
+ r->coeffs[8*i+4] &= 0x1FFF;
+
+ r->coeffs[8*i+5] = a[13*i+8] >> 1;
+ r->coeffs[8*i+5] |= (uint32_t)a[13*i+9] << 7;
+ r->coeffs[8*i+5] &= 0x1FFF;
+
+ r->coeffs[8*i+6] = a[13*i+9] >> 6;
+ r->coeffs[8*i+6] |= (uint32_t)a[13*i+10] << 2;
+ r->coeffs[8*i+6] |= (uint32_t)a[13*i+11] << 10;
+ r->coeffs[8*i+6] &= 0x1FFF;
+
+ r->coeffs[8*i+7] = a[13*i+11] >> 3;
+ r->coeffs[8*i+7] |= (uint32_t)a[13*i+12] << 5;
+ r->coeffs[8*i+7] &= 0x1FFF;
+
+ r->coeffs[8*i+0] = (1 << (D-1)) - r->coeffs[8*i+0];
+ r->coeffs[8*i+1] = (1 << (D-1)) - r->coeffs[8*i+1];
+ r->coeffs[8*i+2] = (1 << (D-1)) - r->coeffs[8*i+2];
+ r->coeffs[8*i+3] = (1 << (D-1)) - r->coeffs[8*i+3];
+ r->coeffs[8*i+4] = (1 << (D-1)) - r->coeffs[8*i+4];
+ r->coeffs[8*i+5] = (1 << (D-1)) - r->coeffs[8*i+5];
+ r->coeffs[8*i+6] = (1 << (D-1)) - r->coeffs[8*i+6];
+ r->coeffs[8*i+7] = (1 << (D-1)) - r->coeffs[8*i+7];
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyz_pack
+*
+* Description: Bit-pack polynomial with coefficients
+* in [-(GAMMA1 - 1), GAMMA1].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYZ_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyz_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint32_t t[4];
+ DBENCH_START();
+
+#if GAMMA1 == (1 << 17)
+ for(i = 0; i < N/4; ++i) {
+ t[0] = GAMMA1 - a->coeffs[4*i+0];
+ t[1] = GAMMA1 - a->coeffs[4*i+1];
+ t[2] = GAMMA1 - a->coeffs[4*i+2];
+ t[3] = GAMMA1 - a->coeffs[4*i+3];
+
+ r[9*i+0] = t[0];
+ r[9*i+1] = t[0] >> 8;
+ r[9*i+2] = t[0] >> 16;
+ r[9*i+2] |= t[1] << 2;
+ r[9*i+3] = t[1] >> 6;
+ r[9*i+4] = t[1] >> 14;
+ r[9*i+4] |= t[2] << 4;
+ r[9*i+5] = t[2] >> 4;
+ r[9*i+6] = t[2] >> 12;
+ r[9*i+6] |= t[3] << 6;
+ r[9*i+7] = t[3] >> 2;
+ r[9*i+8] = t[3] >> 10;
+ }
+#elif GAMMA1 == (1 << 19)
+ for(i = 0; i < N/2; ++i) {
+ t[0] = GAMMA1 - a->coeffs[2*i+0];
+ t[1] = GAMMA1 - a->coeffs[2*i+1];
+
+ r[5*i+0] = t[0];
+ r[5*i+1] = t[0] >> 8;
+ r[5*i+2] = t[0] >> 16;
+ r[5*i+2] |= t[1] << 4;
+ r[5*i+3] = t[1] >> 4;
+ r[5*i+4] = t[1] >> 12;
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyz_unpack
+*
+* Description: Unpack polynomial z with coefficients
+* in [-(GAMMA1 - 1), GAMMA1].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyz_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if GAMMA1 == (1 << 17)
+ for(i = 0; i < N/4; ++i) {
+ r->coeffs[4*i+0] = a[9*i+0];
+ r->coeffs[4*i+0] |= (uint32_t)a[9*i+1] << 8;
+ r->coeffs[4*i+0] |= (uint32_t)a[9*i+2] << 16;
+ r->coeffs[4*i+0] &= 0x3FFFF;
+
+ r->coeffs[4*i+1] = a[9*i+2] >> 2;
+ r->coeffs[4*i+1] |= (uint32_t)a[9*i+3] << 6;
+ r->coeffs[4*i+1] |= (uint32_t)a[9*i+4] << 14;
+ r->coeffs[4*i+1] &= 0x3FFFF;
+
+ r->coeffs[4*i+2] = a[9*i+4] >> 4;
+ r->coeffs[4*i+2] |= (uint32_t)a[9*i+5] << 4;
+ r->coeffs[4*i+2] |= (uint32_t)a[9*i+6] << 12;
+ r->coeffs[4*i+2] &= 0x3FFFF;
+
+ r->coeffs[4*i+3] = a[9*i+6] >> 6;
+ r->coeffs[4*i+3] |= (uint32_t)a[9*i+7] << 2;
+ r->coeffs[4*i+3] |= (uint32_t)a[9*i+8] << 10;
+ r->coeffs[4*i+3] &= 0x3FFFF;
+
+ r->coeffs[4*i+0] = GAMMA1 - r->coeffs[4*i+0];
+ r->coeffs[4*i+1] = GAMMA1 - r->coeffs[4*i+1];
+ r->coeffs[4*i+2] = GAMMA1 - r->coeffs[4*i+2];
+ r->coeffs[4*i+3] = GAMMA1 - r->coeffs[4*i+3];
+ }
+#elif GAMMA1 == (1 << 19)
+ for(i = 0; i < N/2; ++i) {
+ r->coeffs[2*i+0] = a[5*i+0];
+ r->coeffs[2*i+0] |= (uint32_t)a[5*i+1] << 8;
+ r->coeffs[2*i+0] |= (uint32_t)a[5*i+2] << 16;
+ r->coeffs[2*i+0] &= 0xFFFFF;
+
+ r->coeffs[2*i+1] = a[5*i+2] >> 4;
+ r->coeffs[2*i+1] |= (uint32_t)a[5*i+3] << 4;
+ r->coeffs[2*i+1] |= (uint32_t)a[5*i+4] << 12;
+ r->coeffs[2*i+0] &= 0xFFFFF;
+
+ r->coeffs[2*i+0] = GAMMA1 - r->coeffs[2*i+0];
+ r->coeffs[2*i+1] = GAMMA1 - r->coeffs[2*i+1];
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyw1_pack
+*
+* Description: Bit-pack polynomial w1 with coefficients in [0,15] or [0,43].
+* Input coefficients are assumed to be standard representatives.
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYW1_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyw1_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if GAMMA2 == (Q-1)/88
+ for(i = 0; i < N/4; ++i) {
+ r[3*i+0] = a->coeffs[4*i+0];
+ r[3*i+0] |= a->coeffs[4*i+1] << 6;
+ r[3*i+1] = a->coeffs[4*i+1] >> 2;
+ r[3*i+1] |= a->coeffs[4*i+2] << 4;
+ r[3*i+2] = a->coeffs[4*i+2] >> 4;
+ r[3*i+2] |= a->coeffs[4*i+3] << 2;
+ }
+#elif GAMMA2 == (Q-1)/32
+ for(i = 0; i < N/2; ++i)
+ r[i] = a->coeffs[2*i+0] | (a->coeffs[2*i+1] << 4);
+#endif
+
+ DBENCH_STOP(*tpack);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.h
new file mode 100644
index 000000000..d2fd989b6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/poly.h
@@ -0,0 +1,79 @@
+#ifndef POLY_H
+#define POLY_H
+
+#include <stdint.h>
+#include "params.h"
+
+typedef struct {
+ int32_t coeffs[N];
+} poly;
+
+#define poly_reduce DILITHIUM_NAMESPACE(poly_reduce)
+void poly_reduce(poly *a);
+#define poly_caddq DILITHIUM_NAMESPACE(poly_caddq)
+void poly_caddq(poly *a);
+
+#define poly_add DILITHIUM_NAMESPACE(poly_add)
+void poly_add(poly *c, const poly *a, const poly *b);
+#define poly_sub DILITHIUM_NAMESPACE(poly_sub)
+void poly_sub(poly *c, const poly *a, const poly *b);
+#define poly_shiftl DILITHIUM_NAMESPACE(poly_shiftl)
+void poly_shiftl(poly *a);
+
+#define poly_ntt DILITHIUM_NAMESPACE(poly_ntt)
+void poly_ntt(poly *a);
+#define poly_invntt_tomont DILITHIUM_NAMESPACE(poly_invntt_tomont)
+void poly_invntt_tomont(poly *a);
+#define poly_pointwise_montgomery DILITHIUM_NAMESPACE(poly_pointwise_montgomery)
+void poly_pointwise_montgomery(poly *c, const poly *a, const poly *b);
+
+#define poly_power2round DILITHIUM_NAMESPACE(poly_power2round)
+void poly_power2round(poly *a1, poly *a0, const poly *a);
+#define poly_decompose DILITHIUM_NAMESPACE(poly_decompose)
+void poly_decompose(poly *a1, poly *a0, const poly *a);
+#define poly_make_hint DILITHIUM_NAMESPACE(poly_make_hint)
+unsigned int poly_make_hint(poly *h, const poly *a0, const poly *a1);
+#define poly_use_hint DILITHIUM_NAMESPACE(poly_use_hint)
+void poly_use_hint(poly *b, const poly *a, const poly *h);
+
+#define poly_chknorm DILITHIUM_NAMESPACE(poly_chknorm)
+int poly_chknorm(const poly *a, int32_t B);
+#define poly_uniform DILITHIUM_NAMESPACE(poly_uniform)
+void poly_uniform(poly *a,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce);
+#define poly_uniform_eta DILITHIUM_NAMESPACE(poly_uniform_eta)
+void poly_uniform_eta(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+#define poly_uniform_gamma1 DILITHIUM_NAMESPACE(poly_uniform_gamma1)
+void poly_uniform_gamma1(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+#define poly_challenge DILITHIUM_NAMESPACE(poly_challenge)
+void poly_challenge(poly *c, const uint8_t seed[SEEDBYTES]);
+
+#define polyeta_pack DILITHIUM_NAMESPACE(polyeta_pack)
+void polyeta_pack(uint8_t *r, const poly *a);
+#define polyeta_unpack DILITHIUM_NAMESPACE(polyeta_unpack)
+void polyeta_unpack(poly *r, const uint8_t *a);
+
+#define polyt1_pack DILITHIUM_NAMESPACE(polyt1_pack)
+void polyt1_pack(uint8_t *r, const poly *a);
+#define polyt1_unpack DILITHIUM_NAMESPACE(polyt1_unpack)
+void polyt1_unpack(poly *r, const uint8_t *a);
+
+#define polyt0_pack DILITHIUM_NAMESPACE(polyt0_pack)
+void polyt0_pack(uint8_t *r, const poly *a);
+#define polyt0_unpack DILITHIUM_NAMESPACE(polyt0_unpack)
+void polyt0_unpack(poly *r, const uint8_t *a);
+
+#define polyz_pack DILITHIUM_NAMESPACE(polyz_pack)
+void polyz_pack(uint8_t *r, const poly *a);
+#define polyz_unpack DILITHIUM_NAMESPACE(polyz_unpack)
+void polyz_unpack(poly *r, const uint8_t *a);
+
+#define polyw1_pack DILITHIUM_NAMESPACE(polyw1_pack)
+void polyw1_pack(uint8_t *r, const poly *a);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.c
new file mode 100644
index 000000000..c4e9037ab
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.c
@@ -0,0 +1,390 @@
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+#include "poly.h"
+
+/*************************************************
+* Name: expand_mat
+*
+* Description: Implementation of ExpandA. Generates matrix A with uniformly
+* random coefficients a_{i,j} by performing rejection
+* sampling on the output stream of SHAKE128(rho|j|i)
+* or AES256CTR(rho,j|i).
+*
+* Arguments: - polyvecl mat[K]: output matrix
+* - const uint8_t rho[]: byte array containing seed rho
+**************************************************/
+void polyvec_matrix_expand(polyvecl mat[K], const uint8_t rho[SEEDBYTES]) {
+ unsigned int i, j;
+
+ for(i = 0; i < K; ++i)
+ for(j = 0; j < L; ++j)
+ poly_uniform(&mat[i].vec[j], rho, (i << 8) + j);
+}
+
+void polyvec_matrix_pointwise_montgomery(polyveck *t, const polyvecl mat[K], const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ polyvecl_pointwise_acc_montgomery(&t->vec[i], &mat[i], v);
+}
+
+/**************************************************************/
+/************ Vectors of polynomials of length L **************/
+/**************************************************************/
+
+void polyvecl_uniform_eta(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_uniform_eta(&v->vec[i], seed, nonce++);
+}
+
+void polyvecl_uniform_gamma1(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_uniform_gamma1(&v->vec[i], seed, L*nonce + i);
+}
+
+void polyvecl_reduce(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_reduce(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_add
+*
+* Description: Add vectors of polynomials of length L.
+* No modular reduction is performed.
+*
+* Arguments: - polyvecl *w: pointer to output vector
+* - const polyvecl *u: pointer to first summand
+* - const polyvecl *v: pointer to second summand
+**************************************************/
+void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_ntt
+*
+* Description: Forward NTT of all polynomials in vector of length L. Output
+* coefficients can be up to 16*Q larger than input coefficients.
+*
+* Arguments: - polyvecl *v: pointer to input/output vector
+**************************************************/
+void polyvecl_ntt(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_ntt(&v->vec[i]);
+}
+
+void polyvecl_invntt_tomont(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_invntt_tomont(&v->vec[i]);
+}
+
+void polyvecl_pointwise_poly_montgomery(polyvecl *r, const poly *a, const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_pointwise_montgomery(&r->vec[i], a, &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_pointwise_acc_montgomery
+*
+* Description: Pointwise multiply vectors of polynomials of length L, multiply
+* resulting vector by 2^{-32} and add (accumulate) polynomials
+* in it. Input/output vectors are in NTT domain representation.
+*
+* Arguments: - poly *w: output polynomial
+* - const polyvecl *u: pointer to first input vector
+* - const polyvecl *v: pointer to second input vector
+**************************************************/
+void polyvecl_pointwise_acc_montgomery(poly *w,
+ const polyvecl *u,
+ const polyvecl *v)
+{
+ unsigned int i;
+ poly t;
+
+ poly_pointwise_montgomery(w, &u->vec[0], &v->vec[0]);
+ for(i = 1; i < L; ++i) {
+ poly_pointwise_montgomery(&t, &u->vec[i], &v->vec[i]);
+ poly_add(w, w, &t);
+ }
+}
+
+/*************************************************
+* Name: polyvecl_chknorm
+*
+* Description: Check infinity norm of polynomials in vector of length L.
+* Assumes input polyvecl to be reduced by polyvecl_reduce().
+*
+* Arguments: - const polyvecl *v: pointer to vector
+* - int32_t B: norm bound
+*
+* Returns 0 if norm of all polynomials is strictly smaller than B <= (Q-1)/8
+* and 1 otherwise.
+**************************************************/
+int polyvecl_chknorm(const polyvecl *v, int32_t bound) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ if(poly_chknorm(&v->vec[i], bound))
+ return 1;
+
+ return 0;
+}
+
+/**************************************************************/
+/************ Vectors of polynomials of length K **************/
+/**************************************************************/
+
+void polyveck_uniform_eta(polyveck *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_uniform_eta(&v->vec[i], seed, nonce++);
+}
+
+/*************************************************
+* Name: polyveck_reduce
+*
+* Description: Reduce coefficients of polynomials in vector of length K
+* to representatives in [-6283009,6283007].
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_reduce(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_reduce(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_caddq
+*
+* Description: For all coefficients of polynomials in vector of length K
+* add Q if coefficient is negative.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_caddq(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_caddq(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_add
+*
+* Description: Add vectors of polynomials of length K.
+* No modular reduction is performed.
+*
+* Arguments: - polyveck *w: pointer to output vector
+* - const polyveck *u: pointer to first summand
+* - const polyveck *v: pointer to second summand
+**************************************************/
+void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_sub
+*
+* Description: Subtract vectors of polynomials of length K.
+* No modular reduction is performed.
+*
+* Arguments: - polyveck *w: pointer to output vector
+* - const polyveck *u: pointer to first input vector
+* - const polyveck *v: pointer to second input vector to be
+* subtracted from first input vector
+**************************************************/
+void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_sub(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_shiftl
+*
+* Description: Multiply vector of polynomials of Length K by 2^D without modular
+* reduction. Assumes input coefficients to be less than 2^{31-D}.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_shiftl(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_shiftl(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_ntt
+*
+* Description: Forward NTT of all polynomials in vector of length K. Output
+* coefficients can be up to 16*Q larger than input coefficients.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_ntt(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_ntt(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_invntt_tomont
+*
+* Description: Inverse NTT and multiplication by 2^{32} of polynomials
+* in vector of length K. Input coefficients need to be less
+* than 2*Q.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_invntt_tomont(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_invntt_tomont(&v->vec[i]);
+}
+
+void polyveck_pointwise_poly_montgomery(polyveck *r, const poly *a, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_pointwise_montgomery(&r->vec[i], a, &v->vec[i]);
+}
+
+
+/*************************************************
+* Name: polyveck_chknorm
+*
+* Description: Check infinity norm of polynomials in vector of length K.
+* Assumes input polyveck to be reduced by polyveck_reduce().
+*
+* Arguments: - const polyveck *v: pointer to vector
+* - int32_t B: norm bound
+*
+* Returns 0 if norm of all polynomials are strictly smaller than B <= (Q-1)/8
+* and 1 otherwise.
+**************************************************/
+int polyveck_chknorm(const polyveck *v, int32_t bound) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ if(poly_chknorm(&v->vec[i], bound))
+ return 1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: polyveck_power2round
+*
+* Description: For all coefficients a of polynomials in vector of length K,
+* compute a0, a1 such that a mod^+ Q = a1*2^D + a0
+* with -2^{D-1} < a0 <= 2^{D-1}. Assumes coefficients to be
+* standard representatives.
+*
+* Arguments: - polyveck *v1: pointer to output vector of polynomials with
+* coefficients a1
+* - polyveck *v0: pointer to output vector of polynomials with
+* coefficients a0
+* - const polyveck *v: pointer to input vector
+**************************************************/
+void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_power2round(&v1->vec[i], &v0->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_decompose
+*
+* Description: For all coefficients a of polynomials in vector of length K,
+* compute high and low bits a0, a1 such a mod^+ Q = a1*ALPHA + a0
+* with -ALPHA/2 < a0 <= ALPHA/2 except a1 = (Q-1)/ALPHA where we
+* set a1 = 0 and -ALPHA/2 <= a0 = a mod Q - Q < 0.
+* Assumes coefficients to be standard representatives.
+*
+* Arguments: - polyveck *v1: pointer to output vector of polynomials with
+* coefficients a1
+* - polyveck *v0: pointer to output vector of polynomials with
+* coefficients a0
+* - const polyveck *v: pointer to input vector
+**************************************************/
+void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_decompose(&v1->vec[i], &v0->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_make_hint
+*
+* Description: Compute hint vector.
+*
+* Arguments: - polyveck *h: pointer to output vector
+* - const polyveck *v0: pointer to low part of input vector
+* - const polyveck *v1: pointer to high part of input vector
+*
+* Returns number of 1 bits.
+**************************************************/
+unsigned int polyveck_make_hint(polyveck *h,
+ const polyveck *v0,
+ const polyveck *v1)
+{
+ unsigned int i, s = 0;
+
+ for(i = 0; i < K; ++i)
+ s += poly_make_hint(&h->vec[i], &v0->vec[i], &v1->vec[i]);
+
+ return s;
+}
+
+/*************************************************
+* Name: polyveck_use_hint
+*
+* Description: Use hint vector to correct the high bits of input vector.
+*
+* Arguments: - polyveck *w: pointer to output vector of polynomials with
+* corrected high bits
+* - const polyveck *u: pointer to input vector
+* - const polyveck *h: pointer to input hint vector
+**************************************************/
+void polyveck_use_hint(polyveck *w, const polyveck *u, const polyveck *h) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_use_hint(&w->vec[i], &u->vec[i], &h->vec[i]);
+}
+
+void polyveck_pack_w1(uint8_t r[K*POLYW1_PACKEDBYTES], const polyveck *w1) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ polyw1_pack(&r[i*POLYW1_PACKEDBYTES], &w1->vec[i]);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.h
new file mode 100644
index 000000000..615ac5299
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/polyvec.h
@@ -0,0 +1,93 @@
+#ifndef POLYVEC_H
+#define POLYVEC_H
+
+#include <stdint.h>
+#include "params.h"
+#include "poly.h"
+
+/* Vectors of polynomials of length L */
+typedef struct {
+ poly vec[L];
+} polyvecl;
+
+#define polyvecl_uniform_eta DILITHIUM_NAMESPACE(polyvecl_uniform_eta)
+void polyvecl_uniform_eta(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyvecl_uniform_gamma1 DILITHIUM_NAMESPACE(polyvecl_uniform_gamma1)
+void polyvecl_uniform_gamma1(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyvecl_reduce DILITHIUM_NAMESPACE(polyvecl_reduce)
+void polyvecl_reduce(polyvecl *v);
+
+#define polyvecl_add DILITHIUM_NAMESPACE(polyvecl_add)
+void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v);
+
+#define polyvecl_ntt DILITHIUM_NAMESPACE(polyvecl_ntt)
+void polyvecl_ntt(polyvecl *v);
+#define polyvecl_invntt_tomont DILITHIUM_NAMESPACE(polyvecl_invntt_tomont)
+void polyvecl_invntt_tomont(polyvecl *v);
+#define polyvecl_pointwise_poly_montgomery DILITHIUM_NAMESPACE(polyvecl_pointwise_poly_montgomery)
+void polyvecl_pointwise_poly_montgomery(polyvecl *r, const poly *a, const polyvecl *v);
+#define polyvecl_pointwise_acc_montgomery \
+ DILITHIUM_NAMESPACE(polyvecl_pointwise_acc_montgomery)
+void polyvecl_pointwise_acc_montgomery(poly *w,
+ const polyvecl *u,
+ const polyvecl *v);
+
+
+#define polyvecl_chknorm DILITHIUM_NAMESPACE(polyvecl_chknorm)
+int polyvecl_chknorm(const polyvecl *v, int32_t B);
+
+
+
+/* Vectors of polynomials of length K */
+typedef struct {
+ poly vec[K];
+} polyveck;
+
+#define polyveck_uniform_eta DILITHIUM_NAMESPACE(polyveck_uniform_eta)
+void polyveck_uniform_eta(polyveck *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyveck_reduce DILITHIUM_NAMESPACE(polyveck_reduce)
+void polyveck_reduce(polyveck *v);
+#define polyveck_caddq DILITHIUM_NAMESPACE(polyveck_caddq)
+void polyveck_caddq(polyveck *v);
+
+#define polyveck_add DILITHIUM_NAMESPACE(polyveck_add)
+void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v);
+#define polyveck_sub DILITHIUM_NAMESPACE(polyveck_sub)
+void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v);
+#define polyveck_shiftl DILITHIUM_NAMESPACE(polyveck_shiftl)
+void polyveck_shiftl(polyveck *v);
+
+#define polyveck_ntt DILITHIUM_NAMESPACE(polyveck_ntt)
+void polyveck_ntt(polyveck *v);
+#define polyveck_invntt_tomont DILITHIUM_NAMESPACE(polyveck_invntt_tomont)
+void polyveck_invntt_tomont(polyveck *v);
+#define polyveck_pointwise_poly_montgomery DILITHIUM_NAMESPACE(polyveck_pointwise_poly_montgomery)
+void polyveck_pointwise_poly_montgomery(polyveck *r, const poly *a, const polyveck *v);
+
+#define polyveck_chknorm DILITHIUM_NAMESPACE(polyveck_chknorm)
+int polyveck_chknorm(const polyveck *v, int32_t B);
+
+#define polyveck_power2round DILITHIUM_NAMESPACE(polyveck_power2round)
+void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v);
+#define polyveck_decompose DILITHIUM_NAMESPACE(polyveck_decompose)
+void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v);
+#define polyveck_make_hint DILITHIUM_NAMESPACE(polyveck_make_hint)
+unsigned int polyveck_make_hint(polyveck *h,
+ const polyveck *v0,
+ const polyveck *v1);
+#define polyveck_use_hint DILITHIUM_NAMESPACE(polyveck_use_hint)
+void polyveck_use_hint(polyveck *w, const polyveck *v, const polyveck *h);
+
+#define polyveck_pack_w1 DILITHIUM_NAMESPACE(polyveck_pack_w1)
+void polyveck_pack_w1(uint8_t r[K*POLYW1_PACKEDBYTES], const polyveck *w1);
+
+#define polyvec_matrix_expand DILITHIUM_NAMESPACE(polyvec_matrix_expand)
+void polyvec_matrix_expand(polyvecl mat[K], const uint8_t rho[SEEDBYTES]);
+
+#define polyvec_matrix_pointwise_montgomery DILITHIUM_NAMESPACE(polyvec_matrix_pointwise_montgomery)
+void polyvec_matrix_pointwise_montgomery(polyveck *t, const polyvecl mat[K], const polyvecl *v);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/pqcrystals-dilithium_dilithium2_ref.gyp b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/pqcrystals-dilithium_dilithium2_ref.gyp
new file mode 100644
index 000000000..61234f9c6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/pqcrystals-dilithium_dilithium2_ref.gyp
@@ -0,0 +1,41 @@
+# DO NOT EDIT: generated from subdir.gyp.template
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+{
+ 'includes': [
+ '../../../../../../coreconf/config.gypi'
+ ],
+ 'targets': [
+ {
+ 'target_name': 'oqs_src_sig_dilithium_pqcrystals-dilithium_dilithium2_ref',
+ 'type': 'static_library',
+ 'sources': [
+ 'ntt.c',
+ 'packing.c',
+ 'poly.c',
+ 'polyvec.c',
+ 'reduce.c',
+ 'rounding.c',
+ 'sign.c',
+ 'symmetric-shake.c',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/exports.gyp:nss_exports'
+ ]
+ }
+ ],
+ 'target_defaults': {
+ 'defines': [
+ 'DILITHIUM_MODE=2',
+ 'DILITHIUM_RANDOMIZED_SIGNING',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/lib/liboqs/src/common/pqclean_shims',
+ '<(DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits',
+ ]
+ },
+ 'variables': {
+ 'module': 'oqs'
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.c
new file mode 100644
index 000000000..75feff8bc
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.c
@@ -0,0 +1,69 @@
+#include <stdint.h>
+#include "params.h"
+#include "reduce.h"
+
+/*************************************************
+* Name: montgomery_reduce
+*
+* Description: For finite field element a with -2^{31}Q <= a <= Q*2^31,
+* compute r \equiv a*2^{-32} (mod Q) such that -Q < r < Q.
+*
+* Arguments: - int64_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t montgomery_reduce(int64_t a) {
+ int32_t t;
+
+ t = (int64_t)(int32_t)a*QINV;
+ t = (a - (int64_t)t*Q) >> 32;
+ return t;
+}
+
+/*************************************************
+* Name: reduce32
+*
+* Description: For finite field element a with a <= 2^{31} - 2^{22} - 1,
+* compute r \equiv a (mod Q) such that -6283009 <= r <= 6283007.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t reduce32(int32_t a) {
+ int32_t t;
+
+ t = (a + (1 << 22)) >> 23;
+ t = a - t*Q;
+ return t;
+}
+
+/*************************************************
+* Name: caddq
+*
+* Description: Add Q if input coefficient is negative.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t caddq(int32_t a) {
+ a += (a >> 31) & Q;
+ return a;
+}
+
+/*************************************************
+* Name: freeze
+*
+* Description: For finite field element a, compute standard
+* representative r = a mod^+ Q.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t freeze(int32_t a) {
+ a = reduce32(a);
+ a = caddq(a);
+ return a;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.h
new file mode 100644
index 000000000..26d9b4ee2
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/reduce.h
@@ -0,0 +1,22 @@
+#ifndef REDUCE_H
+#define REDUCE_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define MONT -4186625 // 2^32 % Q
+#define QINV 58728449 // q^(-1) mod 2^32
+
+#define montgomery_reduce DILITHIUM_NAMESPACE(montgomery_reduce)
+int32_t montgomery_reduce(int64_t a);
+
+#define reduce32 DILITHIUM_NAMESPACE(reduce32)
+int32_t reduce32(int32_t a);
+
+#define caddq DILITHIUM_NAMESPACE(caddq)
+int32_t caddq(int32_t a);
+
+#define freeze DILITHIUM_NAMESPACE(freeze)
+int32_t freeze(int32_t a);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.c
new file mode 100644
index 000000000..889f0a296
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.c
@@ -0,0 +1,102 @@
+#include <stdint.h>
+#include "params.h"
+#include "rounding.h"
+
+/*************************************************
+* Name: power2round
+*
+* Description: For finite field element a, compute a0, a1 such that
+* a mod^+ Q = a1*2^D + a0 with -2^{D-1} < a0 <= 2^{D-1}.
+* Assumes a to be standard representative.
+*
+* Arguments: - int32_t a: input element
+* - int32_t *a0: pointer to output element a0
+*
+* Returns a1.
+**************************************************/
+int32_t power2round(int32_t *a0, int32_t a) {
+ int32_t a1;
+
+ a1 = (a + (1 << (D-1)) - 1) >> D;
+ *a0 = a - (a1 << D);
+ return a1;
+}
+
+/*************************************************
+* Name: decompose
+*
+* Description: For finite field element a, compute high and low bits a0, a1 such
+* that a mod^+ Q = a1*ALPHA + a0 with -ALPHA/2 < a0 <= ALPHA/2 except
+* if a1 = (Q-1)/ALPHA where we set a1 = 0 and
+* -ALPHA/2 <= a0 = a mod^+ Q - Q < 0. Assumes a to be standard
+* representative.
+*
+* Arguments: - int32_t a: input element
+* - int32_t *a0: pointer to output element a0
+*
+* Returns a1.
+**************************************************/
+int32_t decompose(int32_t *a0, int32_t a) {
+ int32_t a1;
+
+ a1 = (a + 127) >> 7;
+#if GAMMA2 == (Q-1)/32
+ a1 = (a1*1025 + (1 << 21)) >> 22;
+ a1 &= 15;
+#elif GAMMA2 == (Q-1)/88
+ a1 = (a1*11275 + (1 << 23)) >> 24;
+ a1 ^= ((43 - a1) >> 31) & a1;
+#endif
+
+ *a0 = a - a1*2*GAMMA2;
+ *a0 -= (((Q-1)/2 - *a0) >> 31) & Q;
+ return a1;
+}
+
+/*************************************************
+* Name: make_hint
+*
+* Description: Compute hint bit indicating whether the low bits of the
+* input element overflow into the high bits.
+*
+* Arguments: - int32_t a0: low bits of input element
+* - int32_t a1: high bits of input element
+*
+* Returns 1 if overflow.
+**************************************************/
+unsigned int make_hint(int32_t a0, int32_t a1) {
+ if(a0 > GAMMA2 || a0 < -GAMMA2 || (a0 == -GAMMA2 && a1 != 0))
+ return 1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: use_hint
+*
+* Description: Correct high bits according to hint.
+*
+* Arguments: - int32_t a: input element
+* - unsigned int hint: hint bit
+*
+* Returns corrected high bits.
+**************************************************/
+int32_t use_hint(int32_t a, unsigned int hint) {
+ int32_t a0, a1;
+
+ a1 = decompose(&a0, a);
+ if(hint == 0)
+ return a1;
+
+#if GAMMA2 == (Q-1)/32
+ if(a0 > 0)
+ return (a1 + 1) & 15;
+ else
+ return (a1 - 1) & 15;
+#elif GAMMA2 == (Q-1)/88
+ if(a0 > 0)
+ return (a1 == 43) ? 0 : a1 + 1;
+ else
+ return (a1 == 0) ? 43 : a1 - 1;
+#endif
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.h
new file mode 100644
index 000000000..b72e8e8d6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/rounding.h
@@ -0,0 +1,19 @@
+#ifndef ROUNDING_H
+#define ROUNDING_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define power2round DILITHIUM_NAMESPACE(power2round)
+int32_t power2round(int32_t *a0, int32_t a);
+
+#define decompose DILITHIUM_NAMESPACE(decompose)
+int32_t decompose(int32_t *a0, int32_t a);
+
+#define make_hint DILITHIUM_NAMESPACE(make_hint)
+unsigned int make_hint(int32_t a0, int32_t a1);
+
+#define use_hint DILITHIUM_NAMESPACE(use_hint)
+int32_t use_hint(int32_t a, unsigned int hint);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.c
new file mode 100644
index 000000000..16333eb84
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.c
@@ -0,0 +1,337 @@
+#include <stdint.h>
+#include "params.h"
+#include "sign.h"
+#include "packing.h"
+#include "polyvec.h"
+#include "poly.h"
+#include "randombytes.h"
+#include "symmetric.h"
+#include "fips202.h"
+
+/*************************************************
+* Name: crypto_sign_keypair
+*
+* Description: Generates public and private key.
+*
+* Arguments: - uint8_t *pk: pointer to output public key (allocated
+* array of CRYPTO_PUBLICKEYBYTES bytes)
+* - uint8_t *sk: pointer to output private key (allocated
+* array of CRYPTO_SECRETKEYBYTES bytes)
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign_keypair(uint8_t *pk, uint8_t *sk) {
+ uint8_t seedbuf[2*SEEDBYTES + CRHBYTES];
+ uint8_t tr[SEEDBYTES];
+ const uint8_t *rho, *rhoprime, *key;
+ polyvecl mat[K];
+ polyvecl s1, s1hat;
+ polyveck s2, t1, t0;
+
+ /* Get randomness for rho, rhoprime and key */
+ randombytes(seedbuf, SEEDBYTES);
+ shake256(seedbuf, 2*SEEDBYTES + CRHBYTES, seedbuf, SEEDBYTES);
+ rho = seedbuf;
+ rhoprime = rho + SEEDBYTES;
+ key = rhoprime + CRHBYTES;
+
+ /* Expand matrix */
+ polyvec_matrix_expand(mat, rho);
+
+ /* Sample short vectors s1 and s2 */
+ polyvecl_uniform_eta(&s1, rhoprime, 0);
+ polyveck_uniform_eta(&s2, rhoprime, L);
+
+ /* Matrix-vector multiplication */
+ s1hat = s1;
+ polyvecl_ntt(&s1hat);
+ polyvec_matrix_pointwise_montgomery(&t1, mat, &s1hat);
+ polyveck_reduce(&t1);
+ polyveck_invntt_tomont(&t1);
+
+ /* Add error vector s2 */
+ polyveck_add(&t1, &t1, &s2);
+
+ /* Extract t1 and write public key */
+ polyveck_caddq(&t1);
+ polyveck_power2round(&t1, &t0, &t1);
+ pack_pk(pk, rho, &t1);
+
+ /* Compute H(rho, t1) and write secret key */
+ shake256(tr, SEEDBYTES, pk, CRYPTO_PUBLICKEYBYTES);
+ pack_sk(sk, rho, tr, key, &t0, &s1, &s2);
+
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_signature
+*
+* Description: Computes signature.
+*
+* Arguments: - uint8_t *sig: pointer to output signature (of length CRYPTO_BYTES)
+* - size_t *siglen: pointer to output length of signature
+* - uint8_t *m: pointer to message to be signed
+* - size_t mlen: length of message
+* - uint8_t *sk: pointer to bit-packed secret key
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign_signature(uint8_t *sig,
+ size_t *siglen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *sk)
+{
+ unsigned int n;
+ uint8_t seedbuf[3*SEEDBYTES + 2*CRHBYTES];
+ uint8_t *rho, *tr, *key, *mu, *rhoprime;
+ uint16_t nonce = 0;
+ polyvecl mat[K], s1, y, z;
+ polyveck t0, s2, w1, w0, h;
+ poly cp;
+ shake256incctx state;
+
+ rho = seedbuf;
+ tr = rho + SEEDBYTES;
+ key = tr + SEEDBYTES;
+ mu = key + SEEDBYTES;
+ rhoprime = mu + CRHBYTES;
+ unpack_sk(rho, tr, key, &t0, &s1, &s2, sk);
+
+ /* Compute CRH(tr, msg) */
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, tr, SEEDBYTES);
+ shake256_inc_absorb(&state, m, mlen);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(mu, CRHBYTES, &state);
+
+#ifdef DILITHIUM_RANDOMIZED_SIGNING
+ randombytes(rhoprime, CRHBYTES);
+#else
+ shake256(rhoprime, CRHBYTES, key, SEEDBYTES + CRHBYTES);
+#endif
+
+ /* Expand matrix and transform vectors */
+ polyvec_matrix_expand(mat, rho);
+ polyvecl_ntt(&s1);
+ polyveck_ntt(&s2);
+ polyveck_ntt(&t0);
+
+rej:
+ /* Sample intermediate vector y */
+ polyvecl_uniform_gamma1(&y, rhoprime, nonce++);
+
+ /* Matrix-vector multiplication */
+ z = y;
+ polyvecl_ntt(&z);
+ polyvec_matrix_pointwise_montgomery(&w1, mat, &z);
+ polyveck_reduce(&w1);
+ polyveck_invntt_tomont(&w1);
+
+ /* Decompose w and call the random oracle */
+ polyveck_caddq(&w1);
+ polyveck_decompose(&w1, &w0, &w1);
+ polyveck_pack_w1(sig, &w1);
+
+ shake256_inc_ctx_reset(&state);
+ shake256_inc_absorb(&state, mu, CRHBYTES);
+ shake256_inc_absorb(&state, sig, K*POLYW1_PACKEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(sig, SEEDBYTES, &state);
+ poly_challenge(&cp, sig);
+ poly_ntt(&cp);
+
+ /* Compute z, reject if it reveals secret */
+ polyvecl_pointwise_poly_montgomery(&z, &cp, &s1);
+ polyvecl_invntt_tomont(&z);
+ polyvecl_add(&z, &z, &y);
+ polyvecl_reduce(&z);
+ if(polyvecl_chknorm(&z, GAMMA1 - BETA))
+ goto rej;
+
+ /* Check that subtracting cs2 does not change high bits of w and low bits
+ * do not reveal secret information */
+ polyveck_pointwise_poly_montgomery(&h, &cp, &s2);
+ polyveck_invntt_tomont(&h);
+ polyveck_sub(&w0, &w0, &h);
+ polyveck_reduce(&w0);
+ if(polyveck_chknorm(&w0, GAMMA2 - BETA))
+ goto rej;
+
+ /* Compute hints for w1 */
+ polyveck_pointwise_poly_montgomery(&h, &cp, &t0);
+ polyveck_invntt_tomont(&h);
+ polyveck_reduce(&h);
+ if(polyveck_chknorm(&h, GAMMA2))
+ goto rej;
+
+ polyveck_add(&w0, &w0, &h);
+ n = polyveck_make_hint(&h, &w0, &w1);
+ if(n > OMEGA)
+ goto rej;
+
+ shake256_inc_ctx_release(&state);
+
+ /* Write signature */
+ pack_sig(sig, sig, &z, &h);
+ *siglen = CRYPTO_BYTES;
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign
+*
+* Description: Compute signed message.
+*
+* Arguments: - uint8_t *sm: pointer to output signed message (allocated
+* array with CRYPTO_BYTES + mlen bytes),
+* can be equal to m
+* - size_t *smlen: pointer to output length of signed
+* message
+* - const uint8_t *m: pointer to message to be signed
+* - size_t mlen: length of message
+* - const uint8_t *sk: pointer to bit-packed secret key
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign(uint8_t *sm,
+ size_t *smlen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *sk)
+{
+ size_t i;
+
+ for(i = 0; i < mlen; ++i)
+ sm[CRYPTO_BYTES + mlen - 1 - i] = m[mlen - 1 - i];
+ crypto_sign_signature(sm, smlen, sm + CRYPTO_BYTES, mlen, sk);
+ *smlen += mlen;
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_verify
+*
+* Description: Verifies signature.
+*
+* Arguments: - uint8_t *m: pointer to input signature
+* - size_t siglen: length of signature
+* - const uint8_t *m: pointer to message
+* - size_t mlen: length of message
+* - const uint8_t *pk: pointer to bit-packed public key
+*
+* Returns 0 if signature could be verified correctly and -1 otherwise
+**************************************************/
+int crypto_sign_verify(const uint8_t *sig,
+ size_t siglen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *pk)
+{
+ unsigned int i;
+ uint8_t buf[K*POLYW1_PACKEDBYTES];
+ uint8_t rho[SEEDBYTES];
+ uint8_t mu[CRHBYTES];
+ uint8_t c[SEEDBYTES];
+ uint8_t c2[SEEDBYTES];
+ poly cp;
+ polyvecl mat[K], z;
+ polyveck t1, w1, h;
+ shake256incctx state;
+
+ if(siglen != CRYPTO_BYTES)
+ return -1;
+
+ unpack_pk(rho, &t1, pk);
+ if(unpack_sig(c, &z, &h, sig))
+ return -1;
+ if(polyvecl_chknorm(&z, GAMMA1 - BETA))
+ return -1;
+
+ /* Compute CRH(H(rho, t1), msg) */
+ shake256(mu, SEEDBYTES, pk, CRYPTO_PUBLICKEYBYTES);
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, mu, SEEDBYTES);
+ shake256_inc_absorb(&state, m, mlen);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(mu, CRHBYTES, &state);
+
+ /* Matrix-vector multiplication; compute Az - c2^dt1 */
+ poly_challenge(&cp, c);
+ polyvec_matrix_expand(mat, rho);
+
+ polyvecl_ntt(&z);
+ polyvec_matrix_pointwise_montgomery(&w1, mat, &z);
+
+ poly_ntt(&cp);
+ polyveck_shiftl(&t1);
+ polyveck_ntt(&t1);
+ polyveck_pointwise_poly_montgomery(&t1, &cp, &t1);
+
+ polyveck_sub(&w1, &w1, &t1);
+ polyveck_reduce(&w1);
+ polyveck_invntt_tomont(&w1);
+
+ /* Reconstruct w1 */
+ polyveck_caddq(&w1);
+ polyveck_use_hint(&w1, &w1, &h);
+ polyveck_pack_w1(buf, &w1);
+
+ /* Call random oracle and verify challenge */
+ shake256_inc_ctx_reset(&state);
+ shake256_inc_absorb(&state, mu, CRHBYTES);
+ shake256_inc_absorb(&state, buf, K*POLYW1_PACKEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(c2, SEEDBYTES, &state);
+ shake256_inc_ctx_release(&state);
+ for(i = 0; i < SEEDBYTES; ++i)
+ if(c[i] != c2[i])
+ return -1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_open
+*
+* Description: Verify signed message.
+*
+* Arguments: - uint8_t *m: pointer to output message (allocated
+* array with smlen bytes), can be equal to sm
+* - size_t *mlen: pointer to output length of message
+* - const uint8_t *sm: pointer to signed message
+* - size_t smlen: length of signed message
+* - const uint8_t *pk: pointer to bit-packed public key
+*
+* Returns 0 if signed message could be verified correctly and -1 otherwise
+**************************************************/
+int crypto_sign_open(uint8_t *m,
+ size_t *mlen,
+ const uint8_t *sm,
+ size_t smlen,
+ const uint8_t *pk)
+{
+ size_t i;
+
+ if(smlen < CRYPTO_BYTES)
+ goto badsig;
+
+ *mlen = smlen - CRYPTO_BYTES;
+ if(crypto_sign_verify(sm, CRYPTO_BYTES, sm + CRYPTO_BYTES, *mlen, pk))
+ goto badsig;
+ else {
+ /* All good, copy msg, return 0 */
+ for(i = 0; i < *mlen; ++i)
+ m[i] = sm[CRYPTO_BYTES + i];
+ return 0;
+ }
+
+badsig:
+ /* Signature verification failed */
+ *mlen = -1;
+ for(i = 0; i < smlen; ++i)
+ m[i] = 0;
+
+ return -1;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.h
new file mode 100644
index 000000000..295f378c0
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/sign.h
@@ -0,0 +1,36 @@
+#ifndef SIGN_H
+#define SIGN_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+#include "poly.h"
+
+#define challenge DILITHIUM_NAMESPACE(challenge)
+void challenge(poly *c, const uint8_t seed[SEEDBYTES]);
+
+#define crypto_sign_keypair DILITHIUM_NAMESPACE(keypair)
+int crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
+
+#define crypto_sign_signature DILITHIUM_NAMESPACE(signature)
+int crypto_sign_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+#define crypto_sign DILITHIUM_NAMESPACETOP
+int crypto_sign(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+#define crypto_sign_verify DILITHIUM_NAMESPACE(verify)
+int crypto_sign_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+#define crypto_sign_open DILITHIUM_NAMESPACE(open)
+int crypto_sign_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric-shake.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric-shake.c
new file mode 100644
index 000000000..963f64981
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric-shake.c
@@ -0,0 +1,28 @@
+#include <stdint.h>
+#include "params.h"
+#include "symmetric.h"
+#include "fips202.h"
+
+void dilithium_shake128_stream_init(shake128incctx *state, const uint8_t seed[SEEDBYTES], uint16_t nonce)
+{
+ uint8_t t[2];
+ t[0] = nonce;
+ t[1] = nonce >> 8;
+
+ shake128_inc_init(state);
+ shake128_inc_absorb(state, seed, SEEDBYTES);
+ shake128_inc_absorb(state, t, 2);
+ shake128_inc_finalize(state);
+}
+
+void dilithium_shake256_stream_init(shake256incctx *state, const uint8_t seed[CRHBYTES], uint16_t nonce)
+{
+ uint8_t t[2];
+ t[0] = nonce;
+ t[1] = nonce >> 8;
+
+ shake256_inc_init(state);
+ shake256_inc_absorb(state, seed, CRHBYTES);
+ shake256_inc_absorb(state, t, 2);
+ shake256_inc_finalize(state);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric.h
new file mode 100644
index 000000000..eb24363f9
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/symmetric.h
@@ -0,0 +1,69 @@
+#ifndef SYMMETRIC_H
+#define SYMMETRIC_H
+
+#include <stdint.h>
+#include "params.h"
+
+#ifdef DILITHIUM_USE_AES
+
+#include "aes256ctr.h"
+#include "fips202.h"
+
+typedef aes256ctr_ctx stream128_state;
+typedef aes256ctr_ctx stream256_state;
+
+#define dilithium_aes256ctr_init DILITHIUM_NAMESPACE(dilithium_aes256ctr_init)
+void dilithium_aes256ctr_init(aes256ctr_ctx *state,
+ const uint8_t key[32],
+ uint16_t nonce);
+
+#define STREAM128_BLOCKBYTES AES256CTR_BLOCKBYTES
+#define STREAM256_BLOCKBYTES AES256CTR_BLOCKBYTES
+
+#define stream128_init(STATE, SEED, NONCE) \
+ dilithium_aes256ctr_init(STATE, SEED, NONCE)
+#define stream128_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ aes256ctr_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream128_release(STATE) \
+ aes256_ctx_release(STATE)
+#define stream256_init(STATE, SEED, NONCE) \
+ dilithium_aes256ctr_init(STATE, SEED, NONCE)
+#define stream256_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ aes256ctr_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream256_release(STATE) \
+ aes256_ctx_release(STATE)
+
+#else
+
+#include "fips202.h"
+
+typedef shake128incctx stream128_state;
+typedef shake256incctx stream256_state;
+
+#define dilithium_shake128_stream_init DILITHIUM_NAMESPACE(dilithium_shake128_stream_init)
+void dilithium_shake128_stream_init(shake128incctx *state,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce);
+
+#define dilithium_shake256_stream_init DILITHIUM_NAMESPACE(dilithium_shake256_stream_init)
+void dilithium_shake256_stream_init(shake256incctx *state,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+
+#define STREAM128_BLOCKBYTES SHAKE128_RATE
+#define STREAM256_BLOCKBYTES SHAKE256_RATE
+
+#define stream128_init(STATE, SEED, NONCE) \
+ dilithium_shake128_stream_init(STATE, SEED, NONCE)
+#define stream128_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ shake128_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream128_release(STATE) shake128_inc_ctx_release(STATE)
+#define stream256_init(STATE, SEED, NONCE) \
+ dilithium_shake256_stream_init(STATE, SEED, NONCE)
+#define stream256_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ shake256_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream256_release(STATE) shake256_inc_ctx_release(STATE)
+
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/Makefile b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/Makefile
new file mode 100644
index 000000000..fe090f3ff
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/Makefile
@@ -0,0 +1,49 @@
+#! gmake
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY). #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL) #
+#######################################################################
+
+USE_GCOV =
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL). #
+#######################################################################
+
+include config.mk
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL) #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL). #
+#######################################################################
+
+WARNING_CFLAGS = $(NULL)
+
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/api.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/api.h
new file mode 100644
index 000000000..ceeef106d
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/api.h
@@ -0,0 +1,152 @@
+#ifndef API_H
+#define API_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define pqcrystals_dilithium2_PUBLICKEYBYTES 1312
+#define pqcrystals_dilithium2_SECRETKEYBYTES 2528
+#define pqcrystals_dilithium2_BYTES 2420
+
+#define pqcrystals_dilithium2_ref_PUBLICKEYBYTES pqcrystals_dilithium2_PUBLICKEYBYTES
+#define pqcrystals_dilithium2_ref_SECRETKEYBYTES pqcrystals_dilithium2_SECRETKEYBYTES
+#define pqcrystals_dilithium2_ref_BYTES pqcrystals_dilithium2_BYTES
+
+int pqcrystals_dilithium2_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium2_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium2_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium2aes_ref_PUBLICKEYBYTES pqcrystals_dilithium2_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium2aes_ref_SECRETKEYBYTES pqcrystals_dilithium2_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium2aes_ref_BYTES pqcrystals_dilithium2_ref_BYTES
+
+int pqcrystals_dilithium2aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium2aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium3_PUBLICKEYBYTES 1952
+#define pqcrystals_dilithium3_SECRETKEYBYTES 4000
+#define pqcrystals_dilithium3_BYTES 3293
+
+#define pqcrystals_dilithium3_ref_PUBLICKEYBYTES pqcrystals_dilithium3_PUBLICKEYBYTES
+#define pqcrystals_dilithium3_ref_SECRETKEYBYTES pqcrystals_dilithium3_SECRETKEYBYTES
+#define pqcrystals_dilithium3_ref_BYTES pqcrystals_dilithium3_BYTES
+
+int pqcrystals_dilithium3_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium3_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium3_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium3aes_ref_PUBLICKEYBYTES pqcrystals_dilithium3_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium3aes_ref_SECRETKEYBYTES pqcrystals_dilithium3_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium3aes_ref_BYTES pqcrystals_dilithium3_ref_BYTES
+
+int pqcrystals_dilithium3aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium3aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium5_PUBLICKEYBYTES 2592
+#define pqcrystals_dilithium5_SECRETKEYBYTES 4864
+#define pqcrystals_dilithium5_BYTES 4595
+
+#define pqcrystals_dilithium5_ref_PUBLICKEYBYTES pqcrystals_dilithium5_PUBLICKEYBYTES
+#define pqcrystals_dilithium5_ref_SECRETKEYBYTES pqcrystals_dilithium5_SECRETKEYBYTES
+#define pqcrystals_dilithium5_ref_BYTES pqcrystals_dilithium5_BYTES
+
+int pqcrystals_dilithium5_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium5_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium5_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium5aes_ref_PUBLICKEYBYTES pqcrystals_dilithium5_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium5aes_ref_SECRETKEYBYTES pqcrystals_dilithium5_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium5aes_ref_BYTES pqcrystals_dilithium5_ref_BYTES
+
+int pqcrystals_dilithium5aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium5aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.h
new file mode 100644
index 000000000..14b08e0f0
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.h
@@ -0,0 +1,44 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+//#define DILITHIUM_MODE 2
+//#define DILITHIUM_USE_AES
+//#define DILITHIUM_RANDOMIZED_SIGNING
+//#define USE_RDPMC
+//#define DBENCH
+
+#ifndef DILITHIUM_MODE
+#define DILITHIUM_MODE 2
+#endif
+
+#ifdef DILITHIUM_USE_AES
+#if DILITHIUM_MODE == 2
+#define CRYPTO_ALGNAME "Dilithium2-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium2aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium2aes_ref_##s
+#elif DILITHIUM_MODE == 3
+#define CRYPTO_ALGNAME "Dilithium3-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium3aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium3aes_ref_##s
+#elif DILITHIUM_MODE == 5
+#define CRYPTO_ALGNAME "Dilithium5-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium5aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium5aes_ref_##s
+#endif
+#else
+#if DILITHIUM_MODE == 2
+#define CRYPTO_ALGNAME "Dilithium2"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium2_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium2_ref_##s
+#elif DILITHIUM_MODE == 3
+#define CRYPTO_ALGNAME "Dilithium3"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium3_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium3_ref_##s
+#elif DILITHIUM_MODE == 5
+#define CRYPTO_ALGNAME "Dilithium5"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium5_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium5_ref_##s
+#endif
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.mk b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.mk
new file mode 100644
index 000000000..cda56ff88
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/config.mk
@@ -0,0 +1,12 @@
+# DO NOT EDIT: generated from config.mk.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# add fixes for platform integration issues here.
+#
+# liboqs programs expect the public include files to be in oqs/xxxx,
+# So we put liboqs in it's own module, oqs, and point to the dist files
+INCLUDES += -I$(CORE_DEPTH)/lib/liboqs/src/common/pqclean_shims -I$(CORE_DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits
+DEFINES += -DDILITHIUM_MODE=3 -DDILITHIUM_RANDOMIZED_SIGNING
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/manifest.mn b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/manifest.mn
new file mode 100644
index 000000000..0663629ad
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/manifest.mn
@@ -0,0 +1,30 @@
+# DO NOT EDIT: generated from manifest.mn.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CORE_DEPTH = ../../../../../..
+
+MODULE = oqs
+
+LIBRARY_NAME = oqs_src_sig_dilithium_pqcrystals-dilithium_dilithium3_ref
+SHARED_LIBRARY = $(NULL)
+
+CSRCS = \
+ ntt.c \
+ packing.c \
+ poly.c \
+ polyvec.c \
+ reduce.c \
+ rounding.c \
+ sign.c \
+ symmetric-shake.c \
+ $(NULL)
+
+# only add module debugging in opt builds if DEBUG_PKCS11 is set
+ifdef DEBUG_PKCS11
+ DEFINES += -DDEBUG_MODULE
+endif
+
+# This part of the code, including all sub-dirs, can be optimized for size
+export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.c
new file mode 100644
index 000000000..5ea8b530e
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.c
@@ -0,0 +1,98 @@
+#include <stdint.h>
+#include "params.h"
+#include "ntt.h"
+#include "reduce.h"
+
+static const int32_t zetas[N] = {
+ 0, 25847, -2608894, -518909, 237124, -777960, -876248, 466468,
+ 1826347, 2353451, -359251, -2091905, 3119733, -2884855, 3111497, 2680103,
+ 2725464, 1024112, -1079900, 3585928, -549488, -1119584, 2619752, -2108549,
+ -2118186, -3859737, -1399561, -3277672, 1757237, -19422, 4010497, 280005,
+ 2706023, 95776, 3077325, 3530437, -1661693, -3592148, -2537516, 3915439,
+ -3861115, -3043716, 3574422, -2867647, 3539968, -300467, 2348700, -539299,
+ -1699267, -1643818, 3505694, -3821735, 3507263, -2140649, -1600420, 3699596,
+ 811944, 531354, 954230, 3881043, 3900724, -2556880, 2071892, -2797779,
+ -3930395, -1528703, -3677745, -3041255, -1452451, 3475950, 2176455, -1585221,
+ -1257611, 1939314, -4083598, -1000202, -3190144, -3157330, -3632928, 126922,
+ 3412210, -983419, 2147896, 2715295, -2967645, -3693493, -411027, -2477047,
+ -671102, -1228525, -22981, -1308169, -381987, 1349076, 1852771, -1430430,
+ -3343383, 264944, 508951, 3097992, 44288, -1100098, 904516, 3958618,
+ -3724342, -8578, 1653064, -3249728, 2389356, -210977, 759969, -1316856,
+ 189548, -3553272, 3159746, -1851402, -2409325, -177440, 1315589, 1341330,
+ 1285669, -1584928, -812732, -1439742, -3019102, -3881060, -3628969, 3839961,
+ 2091667, 3407706, 2316500, 3817976, -3342478, 2244091, -2446433, -3562462,
+ 266997, 2434439, -1235728, 3513181, -3520352, -3759364, -1197226, -3193378,
+ 900702, 1859098, 909542, 819034, 495491, -1613174, -43260, -522500,
+ -655327, -3122442, 2031748, 3207046, -3556995, -525098, -768622, -3595838,
+ 342297, 286988, -2437823, 4108315, 3437287, -3342277, 1735879, 203044,
+ 2842341, 2691481, -2590150, 1265009, 4055324, 1247620, 2486353, 1595974,
+ -3767016, 1250494, 2635921, -3548272, -2994039, 1869119, 1903435, -1050970,
+ -1333058, 1237275, -3318210, -1430225, -451100, 1312455, 3306115, -1962642,
+ -1279661, 1917081, -2546312, -1374803, 1500165, 777191, 2235880, 3406031,
+ -542412, -2831860, -1671176, -1846953, -2584293, -3724270, 594136, -3776993,
+ -2013608, 2432395, 2454455, -164721, 1957272, 3369112, 185531, -1207385,
+ -3183426, 162844, 1616392, 3014001, 810149, 1652634, -3694233, -1799107,
+ -3038916, 3523897, 3866901, 269760, 2213111, -975884, 1717735, 472078,
+ -426683, 1723600, -1803090, 1910376, -1667432, -1104333, -260646, -3833893,
+ -2939036, -2235985, -420899, -2286327, 183443, -976891, 1612842, -3545687,
+ -554416, 3919660, -48306, -1362209, 3937738, 1400424, -846154, 1976782
+};
+
+/*************************************************
+* Name: ntt
+*
+* Description: Forward NTT, in-place. No modular reduction is performed after
+* additions or subtractions. Output vector is in bitreversed order.
+*
+* Arguments: - uint32_t p[N]: input/output coefficient array
+**************************************************/
+void ntt(int32_t a[N]) {
+ unsigned int len, start, j, k;
+ int32_t zeta, t;
+
+ k = 0;
+ for(len = 128; len > 0; len >>= 1) {
+ for(start = 0; start < N; start = j + len) {
+ zeta = zetas[++k];
+ for(j = start; j < start + len; ++j) {
+ t = montgomery_reduce((int64_t)zeta * a[j + len]);
+ a[j + len] = a[j] - t;
+ a[j] = a[j] + t;
+ }
+ }
+ }
+}
+
+/*************************************************
+* Name: invntt_tomont
+*
+* Description: Inverse NTT and multiplication by Montgomery factor 2^32.
+* In-place. No modular reductions after additions or
+* subtractions; input coefficients need to be smaller than
+* Q in absolute value. Output coefficient are smaller than Q in
+* absolute value.
+*
+* Arguments: - uint32_t p[N]: input/output coefficient array
+**************************************************/
+void invntt_tomont(int32_t a[N]) {
+ unsigned int start, len, j, k;
+ int32_t t, zeta;
+ const int32_t f = 41978; // mont^2/256
+
+ k = 256;
+ for(len = 1; len < N; len <<= 1) {
+ for(start = 0; start < N; start = j + len) {
+ zeta = -zetas[--k];
+ for(j = start; j < start + len; ++j) {
+ t = a[j];
+ a[j] = t + a[j + len];
+ a[j + len] = t - a[j + len];
+ a[j + len] = montgomery_reduce((int64_t)zeta * a[j + len]);
+ }
+ }
+ }
+
+ for(j = 0; j < N; ++j) {
+ a[j] = montgomery_reduce((int64_t)f * a[j]);
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.h
new file mode 100644
index 000000000..731132d5c
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/ntt.h
@@ -0,0 +1,13 @@
+#ifndef NTT_H
+#define NTT_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define ntt DILITHIUM_NAMESPACE(ntt)
+void ntt(int32_t a[N]);
+
+#define invntt_tomont DILITHIUM_NAMESPACE(invntt_tomont)
+void invntt_tomont(int32_t a[N]);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.c
new file mode 100644
index 000000000..9de5826cd
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.c
@@ -0,0 +1,237 @@
+#include "params.h"
+#include "packing.h"
+#include "polyvec.h"
+#include "poly.h"
+
+/*************************************************
+* Name: pack_pk
+*
+* Description: Bit-pack public key pk = (rho, t1).
+*
+* Arguments: - uint8_t pk[]: output byte array
+* - const uint8_t rho[]: byte array containing rho
+* - const polyveck *t1: pointer to vector t1
+**************************************************/
+void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const polyveck *t1)
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ pk[i] = rho[i];
+ pk += SEEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt1_pack(pk + i*POLYT1_PACKEDBYTES, &t1->vec[i]);
+}
+
+/*************************************************
+* Name: unpack_pk
+*
+* Description: Unpack public key pk = (rho, t1).
+*
+* Arguments: - const uint8_t rho[]: output byte array for rho
+* - const polyveck *t1: pointer to output vector t1
+* - uint8_t pk[]: byte array containing bit-packed pk
+**************************************************/
+void unpack_pk(uint8_t rho[SEEDBYTES],
+ polyveck *t1,
+ const uint8_t pk[CRYPTO_PUBLICKEYBYTES])
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ rho[i] = pk[i];
+ pk += SEEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt1_unpack(&t1->vec[i], pk + i*POLYT1_PACKEDBYTES);
+}
+
+/*************************************************
+* Name: pack_sk
+*
+* Description: Bit-pack secret key sk = (rho, tr, key, t0, s1, s2).
+*
+* Arguments: - uint8_t sk[]: output byte array
+* - const uint8_t rho[]: byte array containing rho
+* - const uint8_t tr[]: byte array containing tr
+* - const uint8_t key[]: byte array containing key
+* - const polyveck *t0: pointer to vector t0
+* - const polyvecl *s1: pointer to vector s1
+* - const polyveck *s2: pointer to vector s2
+**************************************************/
+void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const uint8_t tr[SEEDBYTES],
+ const uint8_t key[SEEDBYTES],
+ const polyveck *t0,
+ const polyvecl *s1,
+ const polyveck *s2)
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = rho[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = key[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = tr[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyeta_pack(sk + i*POLYETA_PACKEDBYTES, &s1->vec[i]);
+ sk += L*POLYETA_PACKEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyeta_pack(sk + i*POLYETA_PACKEDBYTES, &s2->vec[i]);
+ sk += K*POLYETA_PACKEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt0_pack(sk + i*POLYT0_PACKEDBYTES, &t0->vec[i]);
+}
+
+/*************************************************
+* Name: unpack_sk
+*
+* Description: Unpack secret key sk = (rho, tr, key, t0, s1, s2).
+*
+* Arguments: - const uint8_t rho[]: output byte array for rho
+* - const uint8_t tr[]: output byte array for tr
+* - const uint8_t key[]: output byte array for key
+* - const polyveck *t0: pointer to output vector t0
+* - const polyvecl *s1: pointer to output vector s1
+* - const polyveck *s2: pointer to output vector s2
+* - uint8_t sk[]: byte array containing bit-packed sk
+**************************************************/
+void unpack_sk(uint8_t rho[SEEDBYTES],
+ uint8_t tr[SEEDBYTES],
+ uint8_t key[SEEDBYTES],
+ polyveck *t0,
+ polyvecl *s1,
+ polyveck *s2,
+ const uint8_t sk[CRYPTO_SECRETKEYBYTES])
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ rho[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ key[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ tr[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i=0; i < L; ++i)
+ polyeta_unpack(&s1->vec[i], sk + i*POLYETA_PACKEDBYTES);
+ sk += L*POLYETA_PACKEDBYTES;
+
+ for(i=0; i < K; ++i)
+ polyeta_unpack(&s2->vec[i], sk + i*POLYETA_PACKEDBYTES);
+ sk += K*POLYETA_PACKEDBYTES;
+
+ for(i=0; i < K; ++i)
+ polyt0_unpack(&t0->vec[i], sk + i*POLYT0_PACKEDBYTES);
+}
+
+/*************************************************
+* Name: pack_sig
+*
+* Description: Bit-pack signature sig = (c, z, h).
+*
+* Arguments: - uint8_t sig[]: output byte array
+* - const uint8_t *c: pointer to challenge hash length SEEDBYTES
+* - const polyvecl *z: pointer to vector z
+* - const polyveck *h: pointer to hint vector h
+**************************************************/
+void pack_sig(uint8_t sig[CRYPTO_BYTES],
+ const uint8_t c[SEEDBYTES],
+ const polyvecl *z,
+ const polyveck *h)
+{
+ unsigned int i, j, k;
+
+ for(i=0; i < SEEDBYTES; ++i)
+ sig[i] = c[i];
+ sig += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyz_pack(sig + i*POLYZ_PACKEDBYTES, &z->vec[i]);
+ sig += L*POLYZ_PACKEDBYTES;
+
+ /* Encode h */
+ for(i = 0; i < OMEGA + K; ++i)
+ sig[i] = 0;
+
+ k = 0;
+ for(i = 0; i < K; ++i) {
+ for(j = 0; j < N; ++j)
+ if(h->vec[i].coeffs[j] != 0)
+ sig[k++] = j;
+
+ sig[OMEGA + i] = k;
+ }
+}
+
+/*************************************************
+* Name: unpack_sig
+*
+* Description: Unpack signature sig = (c, z, h).
+*
+* Arguments: - uint8_t *c: pointer to output challenge hash
+* - polyvecl *z: pointer to output vector z
+* - polyveck *h: pointer to output hint vector h
+* - const uint8_t sig[]: byte array containing
+* bit-packed signature
+*
+* Returns 1 in case of malformed signature; otherwise 0.
+**************************************************/
+int unpack_sig(uint8_t c[SEEDBYTES],
+ polyvecl *z,
+ polyveck *h,
+ const uint8_t sig[CRYPTO_BYTES])
+{
+ unsigned int i, j, k;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ c[i] = sig[i];
+ sig += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyz_unpack(&z->vec[i], sig + i*POLYZ_PACKEDBYTES);
+ sig += L*POLYZ_PACKEDBYTES;
+
+ /* Decode h */
+ k = 0;
+ for(i = 0; i < K; ++i) {
+ for(j = 0; j < N; ++j)
+ h->vec[i].coeffs[j] = 0;
+
+ if(sig[OMEGA + i] < k || sig[OMEGA + i] > OMEGA)
+ return 1;
+
+ for(j = k; j < sig[OMEGA + i]; ++j) {
+ /* Coefficients are ordered for strong unforgeability */
+ if(j > k && sig[j] <= sig[j-1]) return 1;
+ h->vec[i].coeffs[sig[j]] = 1;
+ }
+
+ k = sig[OMEGA + i];
+ }
+
+ /* Extra indices are zero for strong unforgeability */
+ for(j = k; j < OMEGA; ++j)
+ if(sig[j])
+ return 1;
+
+ return 0;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.h
new file mode 100644
index 000000000..7c7cb6f4c
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/packing.h
@@ -0,0 +1,38 @@
+#ifndef PACKING_H
+#define PACKING_H
+
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+
+#define pack_pk DILITHIUM_NAMESPACE(pack_pk)
+void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES], const uint8_t rho[SEEDBYTES], const polyveck *t1);
+
+#define pack_sk DILITHIUM_NAMESPACE(pack_sk)
+void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const uint8_t tr[SEEDBYTES],
+ const uint8_t key[SEEDBYTES],
+ const polyveck *t0,
+ const polyvecl *s1,
+ const polyveck *s2);
+
+#define pack_sig DILITHIUM_NAMESPACE(pack_sig)
+void pack_sig(uint8_t sig[CRYPTO_BYTES], const uint8_t c[SEEDBYTES], const polyvecl *z, const polyveck *h);
+
+#define unpack_pk DILITHIUM_NAMESPACE(unpack_pk)
+void unpack_pk(uint8_t rho[SEEDBYTES], polyveck *t1, const uint8_t pk[CRYPTO_PUBLICKEYBYTES]);
+
+#define unpack_sk DILITHIUM_NAMESPACE(unpack_sk)
+void unpack_sk(uint8_t rho[SEEDBYTES],
+ uint8_t tr[SEEDBYTES],
+ uint8_t key[SEEDBYTES],
+ polyveck *t0,
+ polyvecl *s1,
+ polyveck *s2,
+ const uint8_t sk[CRYPTO_SECRETKEYBYTES]);
+
+#define unpack_sig DILITHIUM_NAMESPACE(unpack_sig)
+int unpack_sig(uint8_t c[SEEDBYTES], polyvecl *z, polyveck *h, const uint8_t sig[CRYPTO_BYTES]);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/params.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/params.h
new file mode 100644
index 000000000..63b02e2db
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/params.h
@@ -0,0 +1,74 @@
+#ifndef PARAMS_H
+#define PARAMS_H
+
+#include "config.h"
+
+#define SEEDBYTES 32
+#define CRHBYTES 64
+#define N 256
+#define Q 8380417
+#define D 13
+#define ROOT_OF_UNITY 1753
+
+#if DILITHIUM_MODE == 2
+#define K 4
+#define L 4
+#define ETA 2
+#define TAU 39
+#define BETA 78
+#define GAMMA1 (1 << 17)
+#define GAMMA2 ((Q-1)/88)
+#define OMEGA 80
+
+#elif DILITHIUM_MODE == 3
+#define K 6
+#define L 5
+#define ETA 4
+#define TAU 49
+#define BETA 196
+#define GAMMA1 (1 << 19)
+#define GAMMA2 ((Q-1)/32)
+#define OMEGA 55
+
+#elif DILITHIUM_MODE == 5
+#define K 8
+#define L 7
+#define ETA 2
+#define TAU 60
+#define BETA 120
+#define GAMMA1 (1 << 19)
+#define GAMMA2 ((Q-1)/32)
+#define OMEGA 75
+
+#endif
+
+#define POLYT1_PACKEDBYTES 320
+#define POLYT0_PACKEDBYTES 416
+#define POLYVECH_PACKEDBYTES (OMEGA + K)
+
+#if GAMMA1 == (1 << 17)
+#define POLYZ_PACKEDBYTES 576
+#elif GAMMA1 == (1 << 19)
+#define POLYZ_PACKEDBYTES 640
+#endif
+
+#if GAMMA2 == (Q-1)/88
+#define POLYW1_PACKEDBYTES 192
+#elif GAMMA2 == (Q-1)/32
+#define POLYW1_PACKEDBYTES 128
+#endif
+
+#if ETA == 2
+#define POLYETA_PACKEDBYTES 96
+#elif ETA == 4
+#define POLYETA_PACKEDBYTES 128
+#endif
+
+#define CRYPTO_PUBLICKEYBYTES (SEEDBYTES + K*POLYT1_PACKEDBYTES)
+#define CRYPTO_SECRETKEYBYTES (3*SEEDBYTES \
+ + L*POLYETA_PACKEDBYTES \
+ + K*POLYETA_PACKEDBYTES \
+ + K*POLYT0_PACKEDBYTES)
+#define CRYPTO_BYTES (SEEDBYTES + L*POLYZ_PACKEDBYTES + POLYVECH_PACKEDBYTES)
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.c
new file mode 100644
index 000000000..006e83c93
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.c
@@ -0,0 +1,911 @@
+#include <stdint.h>
+#include "params.h"
+#include "poly.h"
+#include "ntt.h"
+#include "reduce.h"
+#include "rounding.h"
+#include "symmetric.h"
+
+#ifdef DBENCH
+#include "test/cpucycles.h"
+extern const uint64_t timing_overhead;
+extern uint64_t *tred, *tadd, *tmul, *tround, *tsample, *tpack;
+#define DBENCH_START() uint64_t time = cpucycles()
+#define DBENCH_STOP(t) t += cpucycles() - time - timing_overhead
+#else
+#define DBENCH_START()
+#define DBENCH_STOP(t)
+#endif
+
+/*************************************************
+* Name: poly_reduce
+*
+* Description: Inplace reduction of all coefficients of polynomial to
+* representative in [-6283009,6283007].
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_reduce(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] = reduce32(a->coeffs[i]);
+
+ DBENCH_STOP(*tred);
+}
+
+/*************************************************
+* Name: poly_caddq
+*
+* Description: For all coefficients of in/out polynomial add Q if
+* coefficient is negative.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_caddq(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] = caddq(a->coeffs[i]);
+
+ DBENCH_STOP(*tred);
+}
+
+/*************************************************
+* Name: poly_add
+*
+* Description: Add polynomials. No modular reduction is performed.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first summand
+* - const poly *b: pointer to second summand
+**************************************************/
+void poly_add(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = a->coeffs[i] + b->coeffs[i];
+
+ DBENCH_STOP(*tadd);
+}
+
+/*************************************************
+* Name: poly_sub
+*
+* Description: Subtract polynomials. No modular reduction is
+* performed.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first input polynomial
+* - const poly *b: pointer to second input polynomial to be
+* subtraced from first input polynomial
+**************************************************/
+void poly_sub(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = a->coeffs[i] - b->coeffs[i];
+
+ DBENCH_STOP(*tadd);
+}
+
+/*************************************************
+* Name: poly_shiftl
+*
+* Description: Multiply polynomial by 2^D without modular reduction. Assumes
+* input coefficients to be less than 2^{31-D} in absolute value.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_shiftl(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] <<= D;
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_ntt
+*
+* Description: Inplace forward NTT. Coefficients can grow by
+* 8*Q in absolute value.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_ntt(poly *a) {
+ DBENCH_START();
+
+ ntt(a->coeffs);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_invntt_tomont
+*
+* Description: Inplace inverse NTT and multiplication by 2^{32}.
+* Input coefficients need to be less than Q in absolute
+* value and output coefficients are again bounded by Q.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_invntt_tomont(poly *a) {
+ DBENCH_START();
+
+ invntt_tomont(a->coeffs);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_pointwise_montgomery
+*
+* Description: Pointwise multiplication of polynomials in NTT domain
+* representation and multiplication of resulting polynomial
+* by 2^{-32}.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first input polynomial
+* - const poly *b: pointer to second input polynomial
+**************************************************/
+void poly_pointwise_montgomery(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = montgomery_reduce((int64_t)a->coeffs[i] * b->coeffs[i]);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_power2round
+*
+* Description: For all coefficients c of the input polynomial,
+* compute c0, c1 such that c mod Q = c1*2^D + c0
+* with -2^{D-1} < c0 <= 2^{D-1}. Assumes coefficients to be
+* standard representatives.
+*
+* Arguments: - poly *a1: pointer to output polynomial with coefficients c1
+* - poly *a0: pointer to output polynomial with coefficients c0
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void poly_power2round(poly *a1, poly *a0, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a1->coeffs[i] = power2round(&a0->coeffs[i], a->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_decompose
+*
+* Description: For all coefficients c of the input polynomial,
+* compute high and low bits c0, c1 such c mod Q = c1*ALPHA + c0
+* with -ALPHA/2 < c0 <= ALPHA/2 except c1 = (Q-1)/ALPHA where we
+* set c1 = 0 and -ALPHA/2 <= c0 = c mod Q - Q < 0.
+* Assumes coefficients to be standard representatives.
+*
+* Arguments: - poly *a1: pointer to output polynomial with coefficients c1
+* - poly *a0: pointer to output polynomial with coefficients c0
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void poly_decompose(poly *a1, poly *a0, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a1->coeffs[i] = decompose(&a0->coeffs[i], a->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_make_hint
+*
+* Description: Compute hint polynomial. The coefficients of which indicate
+* whether the low bits of the corresponding coefficient of
+* the input polynomial overflow into the high bits.
+*
+* Arguments: - poly *h: pointer to output hint polynomial
+* - const poly *a0: pointer to low part of input polynomial
+* - const poly *a1: pointer to high part of input polynomial
+*
+* Returns number of 1 bits.
+**************************************************/
+unsigned int poly_make_hint(poly *h, const poly *a0, const poly *a1) {
+ unsigned int i, s = 0;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i) {
+ h->coeffs[i] = make_hint(a0->coeffs[i], a1->coeffs[i]);
+ s += h->coeffs[i];
+ }
+
+ DBENCH_STOP(*tround);
+ return s;
+}
+
+/*************************************************
+* Name: poly_use_hint
+*
+* Description: Use hint polynomial to correct the high bits of a polynomial.
+*
+* Arguments: - poly *b: pointer to output polynomial with corrected high bits
+* - const poly *a: pointer to input polynomial
+* - const poly *h: pointer to input hint polynomial
+**************************************************/
+void poly_use_hint(poly *b, const poly *a, const poly *h) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ b->coeffs[i] = use_hint(a->coeffs[i], h->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_chknorm
+*
+* Description: Check infinity norm of polynomial against given bound.
+* Assumes input coefficients were reduced by reduce32().
+*
+* Arguments: - const poly *a: pointer to polynomial
+* - int32_t B: norm bound
+*
+* Returns 0 if norm is strictly smaller than B <= (Q-1)/8 and 1 otherwise.
+**************************************************/
+int poly_chknorm(const poly *a, int32_t B) {
+ unsigned int i;
+ int32_t t;
+ DBENCH_START();
+
+ if(B > (Q-1)/8)
+ return 1;
+
+ /* It is ok to leak which coefficient violates the bound since
+ the probability for each coefficient is independent of secret
+ data but we must not leak the sign of the centralized representative. */
+ for(i = 0; i < N; ++i) {
+ /* Absolute value */
+ t = a->coeffs[i] >> 31;
+ t = a->coeffs[i] - (t & 2*a->coeffs[i]);
+
+ if(t >= B) {
+ DBENCH_STOP(*tsample);
+ return 1;
+ }
+ }
+
+ DBENCH_STOP(*tsample);
+ return 0;
+}
+
+/*************************************************
+* Name: rej_uniform
+*
+* Description: Sample uniformly random coefficients in [0, Q-1] by
+* performing rejection sampling on array of random bytes.
+*
+* Arguments: - int32_t *a: pointer to output array (allocated)
+* - unsigned int len: number of coefficients to be sampled
+* - const uint8_t *buf: array of random bytes
+* - unsigned int buflen: length of array of random bytes
+*
+* Returns number of sampled coefficients. Can be smaller than len if not enough
+* random bytes were given.
+**************************************************/
+static unsigned int rej_uniform(int32_t *a,
+ unsigned int len,
+ const uint8_t *buf,
+ unsigned int buflen)
+{
+ unsigned int ctr, pos;
+ uint32_t t;
+ DBENCH_START();
+
+ ctr = pos = 0;
+ while(ctr < len && pos + 3 <= buflen) {
+ t = buf[pos++];
+ t |= (uint32_t)buf[pos++] << 8;
+ t |= (uint32_t)buf[pos++] << 16;
+ t &= 0x7FFFFF;
+
+ if(t < Q)
+ a[ctr++] = t;
+ }
+
+ DBENCH_STOP(*tsample);
+ return ctr;
+}
+
+/*************************************************
+* Name: poly_uniform
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [0,Q-1] by performing rejection sampling on the
+* output stream of SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length SEEDBYTES
+* - uint16_t nonce: 2-byte nonce
+**************************************************/
+#define POLY_UNIFORM_NBLOCKS ((768 + STREAM128_BLOCKBYTES - 1)/STREAM128_BLOCKBYTES)
+void poly_uniform(poly *a,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce)
+{
+ unsigned int i, ctr, off;
+ unsigned int buflen = POLY_UNIFORM_NBLOCKS*STREAM128_BLOCKBYTES;
+ uint8_t buf[POLY_UNIFORM_NBLOCKS*STREAM128_BLOCKBYTES + 2];
+ stream128_state state;
+
+ stream128_init(&state, seed, nonce);
+ stream128_squeezeblocks(buf, POLY_UNIFORM_NBLOCKS, &state);
+
+ ctr = rej_uniform(a->coeffs, N, buf, buflen);
+
+ while(ctr < N) {
+ off = buflen % 3;
+ for(i = 0; i < off; ++i)
+ buf[i] = buf[buflen - off + i];
+
+ stream128_squeezeblocks(buf + off, 1, &state);
+ buflen = STREAM128_BLOCKBYTES + off;
+ ctr += rej_uniform(a->coeffs + ctr, N - ctr, buf, buflen);
+ }
+ stream128_release(&state);
+}
+
+/*************************************************
+* Name: rej_eta
+*
+* Description: Sample uniformly random coefficients in [-ETA, ETA] by
+* performing rejection sampling on array of random bytes.
+*
+* Arguments: - int32_t *a: pointer to output array (allocated)
+* - unsigned int len: number of coefficients to be sampled
+* - const uint8_t *buf: array of random bytes
+* - unsigned int buflen: length of array of random bytes
+*
+* Returns number of sampled coefficients. Can be smaller than len if not enough
+* random bytes were given.
+**************************************************/
+static unsigned int rej_eta(int32_t *a,
+ unsigned int len,
+ const uint8_t *buf,
+ unsigned int buflen)
+{
+ unsigned int ctr, pos;
+ uint32_t t0, t1;
+ DBENCH_START();
+
+ ctr = pos = 0;
+ while(ctr < len && pos < buflen) {
+ t0 = buf[pos] & 0x0F;
+ t1 = buf[pos++] >> 4;
+
+#if ETA == 2
+ if(t0 < 15) {
+ t0 = t0 - (205*t0 >> 10)*5;
+ a[ctr++] = 2 - t0;
+ }
+ if(t1 < 15 && ctr < len) {
+ t1 = t1 - (205*t1 >> 10)*5;
+ a[ctr++] = 2 - t1;
+ }
+#elif ETA == 4
+ if(t0 < 9)
+ a[ctr++] = 4 - t0;
+ if(t1 < 9 && ctr < len)
+ a[ctr++] = 4 - t1;
+#endif
+ }
+
+ DBENCH_STOP(*tsample);
+ return ctr;
+}
+
+/*************************************************
+* Name: poly_uniform_eta
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [-ETA,ETA] by performing rejection sampling on the
+* output stream from SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length CRHBYTES
+* - uint16_t nonce: 2-byte nonce
+**************************************************/
+#if ETA == 2
+#define POLY_UNIFORM_ETA_NBLOCKS ((136 + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+#elif ETA == 4
+#define POLY_UNIFORM_ETA_NBLOCKS ((227 + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+#endif
+void poly_uniform_eta(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce)
+{
+ unsigned int ctr;
+ unsigned int buflen = POLY_UNIFORM_ETA_NBLOCKS*STREAM256_BLOCKBYTES;
+ uint8_t buf[POLY_UNIFORM_ETA_NBLOCKS*STREAM256_BLOCKBYTES];
+ stream256_state state;
+
+ stream256_init(&state, seed, nonce);
+ stream256_squeezeblocks(buf, POLY_UNIFORM_ETA_NBLOCKS, &state);
+
+ ctr = rej_eta(a->coeffs, N, buf, buflen);
+
+ while(ctr < N) {
+ stream256_squeezeblocks(buf, 1, &state);
+ ctr += rej_eta(a->coeffs + ctr, N - ctr, buf, STREAM256_BLOCKBYTES);
+ }
+ stream256_release(&state);
+}
+
+/*************************************************
+* Name: poly_uniform_gamma1m1
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [-(GAMMA1 - 1), GAMMA1] by unpacking output stream
+* of SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length CRHBYTES
+* - uint16_t nonce: 16-bit nonce
+**************************************************/
+#define POLY_UNIFORM_GAMMA1_NBLOCKS ((POLYZ_PACKEDBYTES + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+void poly_uniform_gamma1(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce)
+{
+ uint8_t buf[POLY_UNIFORM_GAMMA1_NBLOCKS*STREAM256_BLOCKBYTES];
+ stream256_state state;
+
+ stream256_init(&state, seed, nonce);
+ stream256_squeezeblocks(buf, POLY_UNIFORM_GAMMA1_NBLOCKS, &state);
+ stream256_release(&state);
+ polyz_unpack(a, buf);
+}
+
+/*************************************************
+* Name: challenge
+*
+* Description: Implementation of H. Samples polynomial with TAU nonzero
+* coefficients in {-1,1} using the output stream of
+* SHAKE256(seed).
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const uint8_t mu[]: byte array containing seed of length SEEDBYTES
+**************************************************/
+void poly_challenge(poly *c, const uint8_t seed[SEEDBYTES]) {
+ unsigned int i, b, pos;
+ uint64_t signs;
+ uint8_t buf[SHAKE256_RATE];
+ shake256incctx state;
+
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, seed, SEEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_squeezeblocks(buf, 1, &state);
+
+ signs = 0;
+ for(i = 0; i < 8; ++i)
+ signs |= (uint64_t)buf[i] << 8*i;
+ pos = 8;
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = 0;
+ for(i = N-TAU; i < N; ++i) {
+ do {
+ if(pos >= SHAKE256_RATE) {
+ shake256_squeezeblocks(buf, 1, &state);
+ pos = 0;
+ }
+
+ b = buf[pos++];
+ } while(b > i);
+
+ c->coeffs[i] = c->coeffs[b];
+ c->coeffs[b] = 1 - 2*(signs & 1);
+ signs >>= 1;
+ }
+ shake256_inc_ctx_release(&state);
+}
+
+/*************************************************
+* Name: polyeta_pack
+*
+* Description: Bit-pack polynomial with coefficients in [-ETA,ETA].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYETA_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyeta_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint8_t t[8];
+ DBENCH_START();
+
+#if ETA == 2
+ for(i = 0; i < N/8; ++i) {
+ t[0] = ETA - a->coeffs[8*i+0];
+ t[1] = ETA - a->coeffs[8*i+1];
+ t[2] = ETA - a->coeffs[8*i+2];
+ t[3] = ETA - a->coeffs[8*i+3];
+ t[4] = ETA - a->coeffs[8*i+4];
+ t[5] = ETA - a->coeffs[8*i+5];
+ t[6] = ETA - a->coeffs[8*i+6];
+ t[7] = ETA - a->coeffs[8*i+7];
+
+ r[3*i+0] = (t[0] >> 0) | (t[1] << 3) | (t[2] << 6);
+ r[3*i+1] = (t[2] >> 2) | (t[3] << 1) | (t[4] << 4) | (t[5] << 7);
+ r[3*i+2] = (t[5] >> 1) | (t[6] << 2) | (t[7] << 5);
+ }
+#elif ETA == 4
+ for(i = 0; i < N/2; ++i) {
+ t[0] = ETA - a->coeffs[2*i+0];
+ t[1] = ETA - a->coeffs[2*i+1];
+ r[i] = t[0] | (t[1] << 4);
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyeta_unpack
+*
+* Description: Unpack polynomial with coefficients in [-ETA,ETA].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyeta_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if ETA == 2
+ for(i = 0; i < N/8; ++i) {
+ r->coeffs[8*i+0] = (a[3*i+0] >> 0) & 7;
+ r->coeffs[8*i+1] = (a[3*i+0] >> 3) & 7;
+ r->coeffs[8*i+2] = ((a[3*i+0] >> 6) | (a[3*i+1] << 2)) & 7;
+ r->coeffs[8*i+3] = (a[3*i+1] >> 1) & 7;
+ r->coeffs[8*i+4] = (a[3*i+1] >> 4) & 7;
+ r->coeffs[8*i+5] = ((a[3*i+1] >> 7) | (a[3*i+2] << 1)) & 7;
+ r->coeffs[8*i+6] = (a[3*i+2] >> 2) & 7;
+ r->coeffs[8*i+7] = (a[3*i+2] >> 5) & 7;
+
+ r->coeffs[8*i+0] = ETA - r->coeffs[8*i+0];
+ r->coeffs[8*i+1] = ETA - r->coeffs[8*i+1];
+ r->coeffs[8*i+2] = ETA - r->coeffs[8*i+2];
+ r->coeffs[8*i+3] = ETA - r->coeffs[8*i+3];
+ r->coeffs[8*i+4] = ETA - r->coeffs[8*i+4];
+ r->coeffs[8*i+5] = ETA - r->coeffs[8*i+5];
+ r->coeffs[8*i+6] = ETA - r->coeffs[8*i+6];
+ r->coeffs[8*i+7] = ETA - r->coeffs[8*i+7];
+ }
+#elif ETA == 4
+ for(i = 0; i < N/2; ++i) {
+ r->coeffs[2*i+0] = a[i] & 0x0F;
+ r->coeffs[2*i+1] = a[i] >> 4;
+ r->coeffs[2*i+0] = ETA - r->coeffs[2*i+0];
+ r->coeffs[2*i+1] = ETA - r->coeffs[2*i+1];
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt1_pack
+*
+* Description: Bit-pack polynomial t1 with coefficients fitting in 10 bits.
+* Input coefficients are assumed to be standard representatives.
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYT1_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyt1_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/4; ++i) {
+ r[5*i+0] = (a->coeffs[4*i+0] >> 0);
+ r[5*i+1] = (a->coeffs[4*i+0] >> 8) | (a->coeffs[4*i+1] << 2);
+ r[5*i+2] = (a->coeffs[4*i+1] >> 6) | (a->coeffs[4*i+2] << 4);
+ r[5*i+3] = (a->coeffs[4*i+2] >> 4) | (a->coeffs[4*i+3] << 6);
+ r[5*i+4] = (a->coeffs[4*i+3] >> 2);
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt1_unpack
+*
+* Description: Unpack polynomial t1 with 10-bit coefficients.
+* Output coefficients are standard representatives.
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyt1_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/4; ++i) {
+ r->coeffs[4*i+0] = ((a[5*i+0] >> 0) | ((uint32_t)a[5*i+1] << 8)) & 0x3FF;
+ r->coeffs[4*i+1] = ((a[5*i+1] >> 2) | ((uint32_t)a[5*i+2] << 6)) & 0x3FF;
+ r->coeffs[4*i+2] = ((a[5*i+2] >> 4) | ((uint32_t)a[5*i+3] << 4)) & 0x3FF;
+ r->coeffs[4*i+3] = ((a[5*i+3] >> 6) | ((uint32_t)a[5*i+4] << 2)) & 0x3FF;
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt0_pack
+*
+* Description: Bit-pack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYT0_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyt0_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint32_t t[8];
+ DBENCH_START();
+
+ for(i = 0; i < N/8; ++i) {
+ t[0] = (1 << (D-1)) - a->coeffs[8*i+0];
+ t[1] = (1 << (D-1)) - a->coeffs[8*i+1];
+ t[2] = (1 << (D-1)) - a->coeffs[8*i+2];
+ t[3] = (1 << (D-1)) - a->coeffs[8*i+3];
+ t[4] = (1 << (D-1)) - a->coeffs[8*i+4];
+ t[5] = (1 << (D-1)) - a->coeffs[8*i+5];
+ t[6] = (1 << (D-1)) - a->coeffs[8*i+6];
+ t[7] = (1 << (D-1)) - a->coeffs[8*i+7];
+
+ r[13*i+ 0] = t[0];
+ r[13*i+ 1] = t[0] >> 8;
+ r[13*i+ 1] |= t[1] << 5;
+ r[13*i+ 2] = t[1] >> 3;
+ r[13*i+ 3] = t[1] >> 11;
+ r[13*i+ 3] |= t[2] << 2;
+ r[13*i+ 4] = t[2] >> 6;
+ r[13*i+ 4] |= t[3] << 7;
+ r[13*i+ 5] = t[3] >> 1;
+ r[13*i+ 6] = t[3] >> 9;
+ r[13*i+ 6] |= t[4] << 4;
+ r[13*i+ 7] = t[4] >> 4;
+ r[13*i+ 8] = t[4] >> 12;
+ r[13*i+ 8] |= t[5] << 1;
+ r[13*i+ 9] = t[5] >> 7;
+ r[13*i+ 9] |= t[6] << 6;
+ r[13*i+10] = t[6] >> 2;
+ r[13*i+11] = t[6] >> 10;
+ r[13*i+11] |= t[7] << 3;
+ r[13*i+12] = t[7] >> 5;
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt0_unpack
+*
+* Description: Unpack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyt0_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/8; ++i) {
+ r->coeffs[8*i+0] = a[13*i+0];
+ r->coeffs[8*i+0] |= (uint32_t)a[13*i+1] << 8;
+ r->coeffs[8*i+0] &= 0x1FFF;
+
+ r->coeffs[8*i+1] = a[13*i+1] >> 5;
+ r->coeffs[8*i+1] |= (uint32_t)a[13*i+2] << 3;
+ r->coeffs[8*i+1] |= (uint32_t)a[13*i+3] << 11;
+ r->coeffs[8*i+1] &= 0x1FFF;
+
+ r->coeffs[8*i+2] = a[13*i+3] >> 2;
+ r->coeffs[8*i+2] |= (uint32_t)a[13*i+4] << 6;
+ r->coeffs[8*i+2] &= 0x1FFF;
+
+ r->coeffs[8*i+3] = a[13*i+4] >> 7;
+ r->coeffs[8*i+3] |= (uint32_t)a[13*i+5] << 1;
+ r->coeffs[8*i+3] |= (uint32_t)a[13*i+6] << 9;
+ r->coeffs[8*i+3] &= 0x1FFF;
+
+ r->coeffs[8*i+4] = a[13*i+6] >> 4;
+ r->coeffs[8*i+4] |= (uint32_t)a[13*i+7] << 4;
+ r->coeffs[8*i+4] |= (uint32_t)a[13*i+8] << 12;
+ r->coeffs[8*i+4] &= 0x1FFF;
+
+ r->coeffs[8*i+5] = a[13*i+8] >> 1;
+ r->coeffs[8*i+5] |= (uint32_t)a[13*i+9] << 7;
+ r->coeffs[8*i+5] &= 0x1FFF;
+
+ r->coeffs[8*i+6] = a[13*i+9] >> 6;
+ r->coeffs[8*i+6] |= (uint32_t)a[13*i+10] << 2;
+ r->coeffs[8*i+6] |= (uint32_t)a[13*i+11] << 10;
+ r->coeffs[8*i+6] &= 0x1FFF;
+
+ r->coeffs[8*i+7] = a[13*i+11] >> 3;
+ r->coeffs[8*i+7] |= (uint32_t)a[13*i+12] << 5;
+ r->coeffs[8*i+7] &= 0x1FFF;
+
+ r->coeffs[8*i+0] = (1 << (D-1)) - r->coeffs[8*i+0];
+ r->coeffs[8*i+1] = (1 << (D-1)) - r->coeffs[8*i+1];
+ r->coeffs[8*i+2] = (1 << (D-1)) - r->coeffs[8*i+2];
+ r->coeffs[8*i+3] = (1 << (D-1)) - r->coeffs[8*i+3];
+ r->coeffs[8*i+4] = (1 << (D-1)) - r->coeffs[8*i+4];
+ r->coeffs[8*i+5] = (1 << (D-1)) - r->coeffs[8*i+5];
+ r->coeffs[8*i+6] = (1 << (D-1)) - r->coeffs[8*i+6];
+ r->coeffs[8*i+7] = (1 << (D-1)) - r->coeffs[8*i+7];
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyz_pack
+*
+* Description: Bit-pack polynomial with coefficients
+* in [-(GAMMA1 - 1), GAMMA1].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYZ_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyz_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint32_t t[4];
+ DBENCH_START();
+
+#if GAMMA1 == (1 << 17)
+ for(i = 0; i < N/4; ++i) {
+ t[0] = GAMMA1 - a->coeffs[4*i+0];
+ t[1] = GAMMA1 - a->coeffs[4*i+1];
+ t[2] = GAMMA1 - a->coeffs[4*i+2];
+ t[3] = GAMMA1 - a->coeffs[4*i+3];
+
+ r[9*i+0] = t[0];
+ r[9*i+1] = t[0] >> 8;
+ r[9*i+2] = t[0] >> 16;
+ r[9*i+2] |= t[1] << 2;
+ r[9*i+3] = t[1] >> 6;
+ r[9*i+4] = t[1] >> 14;
+ r[9*i+4] |= t[2] << 4;
+ r[9*i+5] = t[2] >> 4;
+ r[9*i+6] = t[2] >> 12;
+ r[9*i+6] |= t[3] << 6;
+ r[9*i+7] = t[3] >> 2;
+ r[9*i+8] = t[3] >> 10;
+ }
+#elif GAMMA1 == (1 << 19)
+ for(i = 0; i < N/2; ++i) {
+ t[0] = GAMMA1 - a->coeffs[2*i+0];
+ t[1] = GAMMA1 - a->coeffs[2*i+1];
+
+ r[5*i+0] = t[0];
+ r[5*i+1] = t[0] >> 8;
+ r[5*i+2] = t[0] >> 16;
+ r[5*i+2] |= t[1] << 4;
+ r[5*i+3] = t[1] >> 4;
+ r[5*i+4] = t[1] >> 12;
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyz_unpack
+*
+* Description: Unpack polynomial z with coefficients
+* in [-(GAMMA1 - 1), GAMMA1].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyz_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if GAMMA1 == (1 << 17)
+ for(i = 0; i < N/4; ++i) {
+ r->coeffs[4*i+0] = a[9*i+0];
+ r->coeffs[4*i+0] |= (uint32_t)a[9*i+1] << 8;
+ r->coeffs[4*i+0] |= (uint32_t)a[9*i+2] << 16;
+ r->coeffs[4*i+0] &= 0x3FFFF;
+
+ r->coeffs[4*i+1] = a[9*i+2] >> 2;
+ r->coeffs[4*i+1] |= (uint32_t)a[9*i+3] << 6;
+ r->coeffs[4*i+1] |= (uint32_t)a[9*i+4] << 14;
+ r->coeffs[4*i+1] &= 0x3FFFF;
+
+ r->coeffs[4*i+2] = a[9*i+4] >> 4;
+ r->coeffs[4*i+2] |= (uint32_t)a[9*i+5] << 4;
+ r->coeffs[4*i+2] |= (uint32_t)a[9*i+6] << 12;
+ r->coeffs[4*i+2] &= 0x3FFFF;
+
+ r->coeffs[4*i+3] = a[9*i+6] >> 6;
+ r->coeffs[4*i+3] |= (uint32_t)a[9*i+7] << 2;
+ r->coeffs[4*i+3] |= (uint32_t)a[9*i+8] << 10;
+ r->coeffs[4*i+3] &= 0x3FFFF;
+
+ r->coeffs[4*i+0] = GAMMA1 - r->coeffs[4*i+0];
+ r->coeffs[4*i+1] = GAMMA1 - r->coeffs[4*i+1];
+ r->coeffs[4*i+2] = GAMMA1 - r->coeffs[4*i+2];
+ r->coeffs[4*i+3] = GAMMA1 - r->coeffs[4*i+3];
+ }
+#elif GAMMA1 == (1 << 19)
+ for(i = 0; i < N/2; ++i) {
+ r->coeffs[2*i+0] = a[5*i+0];
+ r->coeffs[2*i+0] |= (uint32_t)a[5*i+1] << 8;
+ r->coeffs[2*i+0] |= (uint32_t)a[5*i+2] << 16;
+ r->coeffs[2*i+0] &= 0xFFFFF;
+
+ r->coeffs[2*i+1] = a[5*i+2] >> 4;
+ r->coeffs[2*i+1] |= (uint32_t)a[5*i+3] << 4;
+ r->coeffs[2*i+1] |= (uint32_t)a[5*i+4] << 12;
+ r->coeffs[2*i+0] &= 0xFFFFF;
+
+ r->coeffs[2*i+0] = GAMMA1 - r->coeffs[2*i+0];
+ r->coeffs[2*i+1] = GAMMA1 - r->coeffs[2*i+1];
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyw1_pack
+*
+* Description: Bit-pack polynomial w1 with coefficients in [0,15] or [0,43].
+* Input coefficients are assumed to be standard representatives.
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYW1_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyw1_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if GAMMA2 == (Q-1)/88
+ for(i = 0; i < N/4; ++i) {
+ r[3*i+0] = a->coeffs[4*i+0];
+ r[3*i+0] |= a->coeffs[4*i+1] << 6;
+ r[3*i+1] = a->coeffs[4*i+1] >> 2;
+ r[3*i+1] |= a->coeffs[4*i+2] << 4;
+ r[3*i+2] = a->coeffs[4*i+2] >> 4;
+ r[3*i+2] |= a->coeffs[4*i+3] << 2;
+ }
+#elif GAMMA2 == (Q-1)/32
+ for(i = 0; i < N/2; ++i)
+ r[i] = a->coeffs[2*i+0] | (a->coeffs[2*i+1] << 4);
+#endif
+
+ DBENCH_STOP(*tpack);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.h
new file mode 100644
index 000000000..d2fd989b6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/poly.h
@@ -0,0 +1,79 @@
+#ifndef POLY_H
+#define POLY_H
+
+#include <stdint.h>
+#include "params.h"
+
+typedef struct {
+ int32_t coeffs[N];
+} poly;
+
+#define poly_reduce DILITHIUM_NAMESPACE(poly_reduce)
+void poly_reduce(poly *a);
+#define poly_caddq DILITHIUM_NAMESPACE(poly_caddq)
+void poly_caddq(poly *a);
+
+#define poly_add DILITHIUM_NAMESPACE(poly_add)
+void poly_add(poly *c, const poly *a, const poly *b);
+#define poly_sub DILITHIUM_NAMESPACE(poly_sub)
+void poly_sub(poly *c, const poly *a, const poly *b);
+#define poly_shiftl DILITHIUM_NAMESPACE(poly_shiftl)
+void poly_shiftl(poly *a);
+
+#define poly_ntt DILITHIUM_NAMESPACE(poly_ntt)
+void poly_ntt(poly *a);
+#define poly_invntt_tomont DILITHIUM_NAMESPACE(poly_invntt_tomont)
+void poly_invntt_tomont(poly *a);
+#define poly_pointwise_montgomery DILITHIUM_NAMESPACE(poly_pointwise_montgomery)
+void poly_pointwise_montgomery(poly *c, const poly *a, const poly *b);
+
+#define poly_power2round DILITHIUM_NAMESPACE(poly_power2round)
+void poly_power2round(poly *a1, poly *a0, const poly *a);
+#define poly_decompose DILITHIUM_NAMESPACE(poly_decompose)
+void poly_decompose(poly *a1, poly *a0, const poly *a);
+#define poly_make_hint DILITHIUM_NAMESPACE(poly_make_hint)
+unsigned int poly_make_hint(poly *h, const poly *a0, const poly *a1);
+#define poly_use_hint DILITHIUM_NAMESPACE(poly_use_hint)
+void poly_use_hint(poly *b, const poly *a, const poly *h);
+
+#define poly_chknorm DILITHIUM_NAMESPACE(poly_chknorm)
+int poly_chknorm(const poly *a, int32_t B);
+#define poly_uniform DILITHIUM_NAMESPACE(poly_uniform)
+void poly_uniform(poly *a,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce);
+#define poly_uniform_eta DILITHIUM_NAMESPACE(poly_uniform_eta)
+void poly_uniform_eta(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+#define poly_uniform_gamma1 DILITHIUM_NAMESPACE(poly_uniform_gamma1)
+void poly_uniform_gamma1(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+#define poly_challenge DILITHIUM_NAMESPACE(poly_challenge)
+void poly_challenge(poly *c, const uint8_t seed[SEEDBYTES]);
+
+#define polyeta_pack DILITHIUM_NAMESPACE(polyeta_pack)
+void polyeta_pack(uint8_t *r, const poly *a);
+#define polyeta_unpack DILITHIUM_NAMESPACE(polyeta_unpack)
+void polyeta_unpack(poly *r, const uint8_t *a);
+
+#define polyt1_pack DILITHIUM_NAMESPACE(polyt1_pack)
+void polyt1_pack(uint8_t *r, const poly *a);
+#define polyt1_unpack DILITHIUM_NAMESPACE(polyt1_unpack)
+void polyt1_unpack(poly *r, const uint8_t *a);
+
+#define polyt0_pack DILITHIUM_NAMESPACE(polyt0_pack)
+void polyt0_pack(uint8_t *r, const poly *a);
+#define polyt0_unpack DILITHIUM_NAMESPACE(polyt0_unpack)
+void polyt0_unpack(poly *r, const uint8_t *a);
+
+#define polyz_pack DILITHIUM_NAMESPACE(polyz_pack)
+void polyz_pack(uint8_t *r, const poly *a);
+#define polyz_unpack DILITHIUM_NAMESPACE(polyz_unpack)
+void polyz_unpack(poly *r, const uint8_t *a);
+
+#define polyw1_pack DILITHIUM_NAMESPACE(polyw1_pack)
+void polyw1_pack(uint8_t *r, const poly *a);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.c
new file mode 100644
index 000000000..c4e9037ab
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.c
@@ -0,0 +1,390 @@
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+#include "poly.h"
+
+/*************************************************
+* Name: expand_mat
+*
+* Description: Implementation of ExpandA. Generates matrix A with uniformly
+* random coefficients a_{i,j} by performing rejection
+* sampling on the output stream of SHAKE128(rho|j|i)
+* or AES256CTR(rho,j|i).
+*
+* Arguments: - polyvecl mat[K]: output matrix
+* - const uint8_t rho[]: byte array containing seed rho
+**************************************************/
+void polyvec_matrix_expand(polyvecl mat[K], const uint8_t rho[SEEDBYTES]) {
+ unsigned int i, j;
+
+ for(i = 0; i < K; ++i)
+ for(j = 0; j < L; ++j)
+ poly_uniform(&mat[i].vec[j], rho, (i << 8) + j);
+}
+
+void polyvec_matrix_pointwise_montgomery(polyveck *t, const polyvecl mat[K], const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ polyvecl_pointwise_acc_montgomery(&t->vec[i], &mat[i], v);
+}
+
+/**************************************************************/
+/************ Vectors of polynomials of length L **************/
+/**************************************************************/
+
+void polyvecl_uniform_eta(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_uniform_eta(&v->vec[i], seed, nonce++);
+}
+
+void polyvecl_uniform_gamma1(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_uniform_gamma1(&v->vec[i], seed, L*nonce + i);
+}
+
+void polyvecl_reduce(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_reduce(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_add
+*
+* Description: Add vectors of polynomials of length L.
+* No modular reduction is performed.
+*
+* Arguments: - polyvecl *w: pointer to output vector
+* - const polyvecl *u: pointer to first summand
+* - const polyvecl *v: pointer to second summand
+**************************************************/
+void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_ntt
+*
+* Description: Forward NTT of all polynomials in vector of length L. Output
+* coefficients can be up to 16*Q larger than input coefficients.
+*
+* Arguments: - polyvecl *v: pointer to input/output vector
+**************************************************/
+void polyvecl_ntt(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_ntt(&v->vec[i]);
+}
+
+void polyvecl_invntt_tomont(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_invntt_tomont(&v->vec[i]);
+}
+
+void polyvecl_pointwise_poly_montgomery(polyvecl *r, const poly *a, const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_pointwise_montgomery(&r->vec[i], a, &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_pointwise_acc_montgomery
+*
+* Description: Pointwise multiply vectors of polynomials of length L, multiply
+* resulting vector by 2^{-32} and add (accumulate) polynomials
+* in it. Input/output vectors are in NTT domain representation.
+*
+* Arguments: - poly *w: output polynomial
+* - const polyvecl *u: pointer to first input vector
+* - const polyvecl *v: pointer to second input vector
+**************************************************/
+void polyvecl_pointwise_acc_montgomery(poly *w,
+ const polyvecl *u,
+ const polyvecl *v)
+{
+ unsigned int i;
+ poly t;
+
+ poly_pointwise_montgomery(w, &u->vec[0], &v->vec[0]);
+ for(i = 1; i < L; ++i) {
+ poly_pointwise_montgomery(&t, &u->vec[i], &v->vec[i]);
+ poly_add(w, w, &t);
+ }
+}
+
+/*************************************************
+* Name: polyvecl_chknorm
+*
+* Description: Check infinity norm of polynomials in vector of length L.
+* Assumes input polyvecl to be reduced by polyvecl_reduce().
+*
+* Arguments: - const polyvecl *v: pointer to vector
+* - int32_t B: norm bound
+*
+* Returns 0 if norm of all polynomials is strictly smaller than B <= (Q-1)/8
+* and 1 otherwise.
+**************************************************/
+int polyvecl_chknorm(const polyvecl *v, int32_t bound) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ if(poly_chknorm(&v->vec[i], bound))
+ return 1;
+
+ return 0;
+}
+
+/**************************************************************/
+/************ Vectors of polynomials of length K **************/
+/**************************************************************/
+
+void polyveck_uniform_eta(polyveck *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_uniform_eta(&v->vec[i], seed, nonce++);
+}
+
+/*************************************************
+* Name: polyveck_reduce
+*
+* Description: Reduce coefficients of polynomials in vector of length K
+* to representatives in [-6283009,6283007].
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_reduce(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_reduce(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_caddq
+*
+* Description: For all coefficients of polynomials in vector of length K
+* add Q if coefficient is negative.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_caddq(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_caddq(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_add
+*
+* Description: Add vectors of polynomials of length K.
+* No modular reduction is performed.
+*
+* Arguments: - polyveck *w: pointer to output vector
+* - const polyveck *u: pointer to first summand
+* - const polyveck *v: pointer to second summand
+**************************************************/
+void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_sub
+*
+* Description: Subtract vectors of polynomials of length K.
+* No modular reduction is performed.
+*
+* Arguments: - polyveck *w: pointer to output vector
+* - const polyveck *u: pointer to first input vector
+* - const polyveck *v: pointer to second input vector to be
+* subtracted from first input vector
+**************************************************/
+void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_sub(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_shiftl
+*
+* Description: Multiply vector of polynomials of Length K by 2^D without modular
+* reduction. Assumes input coefficients to be less than 2^{31-D}.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_shiftl(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_shiftl(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_ntt
+*
+* Description: Forward NTT of all polynomials in vector of length K. Output
+* coefficients can be up to 16*Q larger than input coefficients.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_ntt(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_ntt(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_invntt_tomont
+*
+* Description: Inverse NTT and multiplication by 2^{32} of polynomials
+* in vector of length K. Input coefficients need to be less
+* than 2*Q.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_invntt_tomont(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_invntt_tomont(&v->vec[i]);
+}
+
+void polyveck_pointwise_poly_montgomery(polyveck *r, const poly *a, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_pointwise_montgomery(&r->vec[i], a, &v->vec[i]);
+}
+
+
+/*************************************************
+* Name: polyveck_chknorm
+*
+* Description: Check infinity norm of polynomials in vector of length K.
+* Assumes input polyveck to be reduced by polyveck_reduce().
+*
+* Arguments: - const polyveck *v: pointer to vector
+* - int32_t B: norm bound
+*
+* Returns 0 if norm of all polynomials are strictly smaller than B <= (Q-1)/8
+* and 1 otherwise.
+**************************************************/
+int polyveck_chknorm(const polyveck *v, int32_t bound) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ if(poly_chknorm(&v->vec[i], bound))
+ return 1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: polyveck_power2round
+*
+* Description: For all coefficients a of polynomials in vector of length K,
+* compute a0, a1 such that a mod^+ Q = a1*2^D + a0
+* with -2^{D-1} < a0 <= 2^{D-1}. Assumes coefficients to be
+* standard representatives.
+*
+* Arguments: - polyveck *v1: pointer to output vector of polynomials with
+* coefficients a1
+* - polyveck *v0: pointer to output vector of polynomials with
+* coefficients a0
+* - const polyveck *v: pointer to input vector
+**************************************************/
+void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_power2round(&v1->vec[i], &v0->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_decompose
+*
+* Description: For all coefficients a of polynomials in vector of length K,
+* compute high and low bits a0, a1 such a mod^+ Q = a1*ALPHA + a0
+* with -ALPHA/2 < a0 <= ALPHA/2 except a1 = (Q-1)/ALPHA where we
+* set a1 = 0 and -ALPHA/2 <= a0 = a mod Q - Q < 0.
+* Assumes coefficients to be standard representatives.
+*
+* Arguments: - polyveck *v1: pointer to output vector of polynomials with
+* coefficients a1
+* - polyveck *v0: pointer to output vector of polynomials with
+* coefficients a0
+* - const polyveck *v: pointer to input vector
+**************************************************/
+void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_decompose(&v1->vec[i], &v0->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_make_hint
+*
+* Description: Compute hint vector.
+*
+* Arguments: - polyveck *h: pointer to output vector
+* - const polyveck *v0: pointer to low part of input vector
+* - const polyveck *v1: pointer to high part of input vector
+*
+* Returns number of 1 bits.
+**************************************************/
+unsigned int polyveck_make_hint(polyveck *h,
+ const polyveck *v0,
+ const polyveck *v1)
+{
+ unsigned int i, s = 0;
+
+ for(i = 0; i < K; ++i)
+ s += poly_make_hint(&h->vec[i], &v0->vec[i], &v1->vec[i]);
+
+ return s;
+}
+
+/*************************************************
+* Name: polyveck_use_hint
+*
+* Description: Use hint vector to correct the high bits of input vector.
+*
+* Arguments: - polyveck *w: pointer to output vector of polynomials with
+* corrected high bits
+* - const polyveck *u: pointer to input vector
+* - const polyveck *h: pointer to input hint vector
+**************************************************/
+void polyveck_use_hint(polyveck *w, const polyveck *u, const polyveck *h) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_use_hint(&w->vec[i], &u->vec[i], &h->vec[i]);
+}
+
+void polyveck_pack_w1(uint8_t r[K*POLYW1_PACKEDBYTES], const polyveck *w1) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ polyw1_pack(&r[i*POLYW1_PACKEDBYTES], &w1->vec[i]);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.h
new file mode 100644
index 000000000..615ac5299
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/polyvec.h
@@ -0,0 +1,93 @@
+#ifndef POLYVEC_H
+#define POLYVEC_H
+
+#include <stdint.h>
+#include "params.h"
+#include "poly.h"
+
+/* Vectors of polynomials of length L */
+typedef struct {
+ poly vec[L];
+} polyvecl;
+
+#define polyvecl_uniform_eta DILITHIUM_NAMESPACE(polyvecl_uniform_eta)
+void polyvecl_uniform_eta(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyvecl_uniform_gamma1 DILITHIUM_NAMESPACE(polyvecl_uniform_gamma1)
+void polyvecl_uniform_gamma1(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyvecl_reduce DILITHIUM_NAMESPACE(polyvecl_reduce)
+void polyvecl_reduce(polyvecl *v);
+
+#define polyvecl_add DILITHIUM_NAMESPACE(polyvecl_add)
+void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v);
+
+#define polyvecl_ntt DILITHIUM_NAMESPACE(polyvecl_ntt)
+void polyvecl_ntt(polyvecl *v);
+#define polyvecl_invntt_tomont DILITHIUM_NAMESPACE(polyvecl_invntt_tomont)
+void polyvecl_invntt_tomont(polyvecl *v);
+#define polyvecl_pointwise_poly_montgomery DILITHIUM_NAMESPACE(polyvecl_pointwise_poly_montgomery)
+void polyvecl_pointwise_poly_montgomery(polyvecl *r, const poly *a, const polyvecl *v);
+#define polyvecl_pointwise_acc_montgomery \
+ DILITHIUM_NAMESPACE(polyvecl_pointwise_acc_montgomery)
+void polyvecl_pointwise_acc_montgomery(poly *w,
+ const polyvecl *u,
+ const polyvecl *v);
+
+
+#define polyvecl_chknorm DILITHIUM_NAMESPACE(polyvecl_chknorm)
+int polyvecl_chknorm(const polyvecl *v, int32_t B);
+
+
+
+/* Vectors of polynomials of length K */
+typedef struct {
+ poly vec[K];
+} polyveck;
+
+#define polyveck_uniform_eta DILITHIUM_NAMESPACE(polyveck_uniform_eta)
+void polyveck_uniform_eta(polyveck *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyveck_reduce DILITHIUM_NAMESPACE(polyveck_reduce)
+void polyveck_reduce(polyveck *v);
+#define polyveck_caddq DILITHIUM_NAMESPACE(polyveck_caddq)
+void polyveck_caddq(polyveck *v);
+
+#define polyveck_add DILITHIUM_NAMESPACE(polyveck_add)
+void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v);
+#define polyveck_sub DILITHIUM_NAMESPACE(polyveck_sub)
+void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v);
+#define polyveck_shiftl DILITHIUM_NAMESPACE(polyveck_shiftl)
+void polyveck_shiftl(polyveck *v);
+
+#define polyveck_ntt DILITHIUM_NAMESPACE(polyveck_ntt)
+void polyveck_ntt(polyveck *v);
+#define polyveck_invntt_tomont DILITHIUM_NAMESPACE(polyveck_invntt_tomont)
+void polyveck_invntt_tomont(polyveck *v);
+#define polyveck_pointwise_poly_montgomery DILITHIUM_NAMESPACE(polyveck_pointwise_poly_montgomery)
+void polyveck_pointwise_poly_montgomery(polyveck *r, const poly *a, const polyveck *v);
+
+#define polyveck_chknorm DILITHIUM_NAMESPACE(polyveck_chknorm)
+int polyveck_chknorm(const polyveck *v, int32_t B);
+
+#define polyveck_power2round DILITHIUM_NAMESPACE(polyveck_power2round)
+void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v);
+#define polyveck_decompose DILITHIUM_NAMESPACE(polyveck_decompose)
+void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v);
+#define polyveck_make_hint DILITHIUM_NAMESPACE(polyveck_make_hint)
+unsigned int polyveck_make_hint(polyveck *h,
+ const polyveck *v0,
+ const polyveck *v1);
+#define polyveck_use_hint DILITHIUM_NAMESPACE(polyveck_use_hint)
+void polyveck_use_hint(polyveck *w, const polyveck *v, const polyveck *h);
+
+#define polyveck_pack_w1 DILITHIUM_NAMESPACE(polyveck_pack_w1)
+void polyveck_pack_w1(uint8_t r[K*POLYW1_PACKEDBYTES], const polyveck *w1);
+
+#define polyvec_matrix_expand DILITHIUM_NAMESPACE(polyvec_matrix_expand)
+void polyvec_matrix_expand(polyvecl mat[K], const uint8_t rho[SEEDBYTES]);
+
+#define polyvec_matrix_pointwise_montgomery DILITHIUM_NAMESPACE(polyvec_matrix_pointwise_montgomery)
+void polyvec_matrix_pointwise_montgomery(polyveck *t, const polyvecl mat[K], const polyvecl *v);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/pqcrystals-dilithium_dilithium3_ref.gyp b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/pqcrystals-dilithium_dilithium3_ref.gyp
new file mode 100644
index 000000000..cd518dd5d
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/pqcrystals-dilithium_dilithium3_ref.gyp
@@ -0,0 +1,41 @@
+# DO NOT EDIT: generated from subdir.gyp.template
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+{
+ 'includes': [
+ '../../../../../../coreconf/config.gypi'
+ ],
+ 'targets': [
+ {
+ 'target_name': 'oqs_src_sig_dilithium_pqcrystals-dilithium_dilithium3_ref',
+ 'type': 'static_library',
+ 'sources': [
+ 'ntt.c',
+ 'packing.c',
+ 'poly.c',
+ 'polyvec.c',
+ 'reduce.c',
+ 'rounding.c',
+ 'sign.c',
+ 'symmetric-shake.c',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/exports.gyp:nss_exports'
+ ]
+ }
+ ],
+ 'target_defaults': {
+ 'defines': [
+ 'DILITHIUM_MODE=3',
+ 'DILITHIUM_RANDOMIZED_SIGNING',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/lib/liboqs/src/common/pqclean_shims',
+ '<(DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits',
+ ]
+ },
+ 'variables': {
+ 'module': 'oqs'
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.c
new file mode 100644
index 000000000..75feff8bc
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.c
@@ -0,0 +1,69 @@
+#include <stdint.h>
+#include "params.h"
+#include "reduce.h"
+
+/*************************************************
+* Name: montgomery_reduce
+*
+* Description: For finite field element a with -2^{31}Q <= a <= Q*2^31,
+* compute r \equiv a*2^{-32} (mod Q) such that -Q < r < Q.
+*
+* Arguments: - int64_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t montgomery_reduce(int64_t a) {
+ int32_t t;
+
+ t = (int64_t)(int32_t)a*QINV;
+ t = (a - (int64_t)t*Q) >> 32;
+ return t;
+}
+
+/*************************************************
+* Name: reduce32
+*
+* Description: For finite field element a with a <= 2^{31} - 2^{22} - 1,
+* compute r \equiv a (mod Q) such that -6283009 <= r <= 6283007.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t reduce32(int32_t a) {
+ int32_t t;
+
+ t = (a + (1 << 22)) >> 23;
+ t = a - t*Q;
+ return t;
+}
+
+/*************************************************
+* Name: caddq
+*
+* Description: Add Q if input coefficient is negative.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t caddq(int32_t a) {
+ a += (a >> 31) & Q;
+ return a;
+}
+
+/*************************************************
+* Name: freeze
+*
+* Description: For finite field element a, compute standard
+* representative r = a mod^+ Q.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t freeze(int32_t a) {
+ a = reduce32(a);
+ a = caddq(a);
+ return a;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.h
new file mode 100644
index 000000000..26d9b4ee2
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/reduce.h
@@ -0,0 +1,22 @@
+#ifndef REDUCE_H
+#define REDUCE_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define MONT -4186625 // 2^32 % Q
+#define QINV 58728449 // q^(-1) mod 2^32
+
+#define montgomery_reduce DILITHIUM_NAMESPACE(montgomery_reduce)
+int32_t montgomery_reduce(int64_t a);
+
+#define reduce32 DILITHIUM_NAMESPACE(reduce32)
+int32_t reduce32(int32_t a);
+
+#define caddq DILITHIUM_NAMESPACE(caddq)
+int32_t caddq(int32_t a);
+
+#define freeze DILITHIUM_NAMESPACE(freeze)
+int32_t freeze(int32_t a);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.c
new file mode 100644
index 000000000..889f0a296
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.c
@@ -0,0 +1,102 @@
+#include <stdint.h>
+#include "params.h"
+#include "rounding.h"
+
+/*************************************************
+* Name: power2round
+*
+* Description: For finite field element a, compute a0, a1 such that
+* a mod^+ Q = a1*2^D + a0 with -2^{D-1} < a0 <= 2^{D-1}.
+* Assumes a to be standard representative.
+*
+* Arguments: - int32_t a: input element
+* - int32_t *a0: pointer to output element a0
+*
+* Returns a1.
+**************************************************/
+int32_t power2round(int32_t *a0, int32_t a) {
+ int32_t a1;
+
+ a1 = (a + (1 << (D-1)) - 1) >> D;
+ *a0 = a - (a1 << D);
+ return a1;
+}
+
+/*************************************************
+* Name: decompose
+*
+* Description: For finite field element a, compute high and low bits a0, a1 such
+* that a mod^+ Q = a1*ALPHA + a0 with -ALPHA/2 < a0 <= ALPHA/2 except
+* if a1 = (Q-1)/ALPHA where we set a1 = 0 and
+* -ALPHA/2 <= a0 = a mod^+ Q - Q < 0. Assumes a to be standard
+* representative.
+*
+* Arguments: - int32_t a: input element
+* - int32_t *a0: pointer to output element a0
+*
+* Returns a1.
+**************************************************/
+int32_t decompose(int32_t *a0, int32_t a) {
+ int32_t a1;
+
+ a1 = (a + 127) >> 7;
+#if GAMMA2 == (Q-1)/32
+ a1 = (a1*1025 + (1 << 21)) >> 22;
+ a1 &= 15;
+#elif GAMMA2 == (Q-1)/88
+ a1 = (a1*11275 + (1 << 23)) >> 24;
+ a1 ^= ((43 - a1) >> 31) & a1;
+#endif
+
+ *a0 = a - a1*2*GAMMA2;
+ *a0 -= (((Q-1)/2 - *a0) >> 31) & Q;
+ return a1;
+}
+
+/*************************************************
+* Name: make_hint
+*
+* Description: Compute hint bit indicating whether the low bits of the
+* input element overflow into the high bits.
+*
+* Arguments: - int32_t a0: low bits of input element
+* - int32_t a1: high bits of input element
+*
+* Returns 1 if overflow.
+**************************************************/
+unsigned int make_hint(int32_t a0, int32_t a1) {
+ if(a0 > GAMMA2 || a0 < -GAMMA2 || (a0 == -GAMMA2 && a1 != 0))
+ return 1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: use_hint
+*
+* Description: Correct high bits according to hint.
+*
+* Arguments: - int32_t a: input element
+* - unsigned int hint: hint bit
+*
+* Returns corrected high bits.
+**************************************************/
+int32_t use_hint(int32_t a, unsigned int hint) {
+ int32_t a0, a1;
+
+ a1 = decompose(&a0, a);
+ if(hint == 0)
+ return a1;
+
+#if GAMMA2 == (Q-1)/32
+ if(a0 > 0)
+ return (a1 + 1) & 15;
+ else
+ return (a1 - 1) & 15;
+#elif GAMMA2 == (Q-1)/88
+ if(a0 > 0)
+ return (a1 == 43) ? 0 : a1 + 1;
+ else
+ return (a1 == 0) ? 43 : a1 - 1;
+#endif
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.h
new file mode 100644
index 000000000..b72e8e8d6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/rounding.h
@@ -0,0 +1,19 @@
+#ifndef ROUNDING_H
+#define ROUNDING_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define power2round DILITHIUM_NAMESPACE(power2round)
+int32_t power2round(int32_t *a0, int32_t a);
+
+#define decompose DILITHIUM_NAMESPACE(decompose)
+int32_t decompose(int32_t *a0, int32_t a);
+
+#define make_hint DILITHIUM_NAMESPACE(make_hint)
+unsigned int make_hint(int32_t a0, int32_t a1);
+
+#define use_hint DILITHIUM_NAMESPACE(use_hint)
+int32_t use_hint(int32_t a, unsigned int hint);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.c
new file mode 100644
index 000000000..16333eb84
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.c
@@ -0,0 +1,337 @@
+#include <stdint.h>
+#include "params.h"
+#include "sign.h"
+#include "packing.h"
+#include "polyvec.h"
+#include "poly.h"
+#include "randombytes.h"
+#include "symmetric.h"
+#include "fips202.h"
+
+/*************************************************
+* Name: crypto_sign_keypair
+*
+* Description: Generates public and private key.
+*
+* Arguments: - uint8_t *pk: pointer to output public key (allocated
+* array of CRYPTO_PUBLICKEYBYTES bytes)
+* - uint8_t *sk: pointer to output private key (allocated
+* array of CRYPTO_SECRETKEYBYTES bytes)
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign_keypair(uint8_t *pk, uint8_t *sk) {
+ uint8_t seedbuf[2*SEEDBYTES + CRHBYTES];
+ uint8_t tr[SEEDBYTES];
+ const uint8_t *rho, *rhoprime, *key;
+ polyvecl mat[K];
+ polyvecl s1, s1hat;
+ polyveck s2, t1, t0;
+
+ /* Get randomness for rho, rhoprime and key */
+ randombytes(seedbuf, SEEDBYTES);
+ shake256(seedbuf, 2*SEEDBYTES + CRHBYTES, seedbuf, SEEDBYTES);
+ rho = seedbuf;
+ rhoprime = rho + SEEDBYTES;
+ key = rhoprime + CRHBYTES;
+
+ /* Expand matrix */
+ polyvec_matrix_expand(mat, rho);
+
+ /* Sample short vectors s1 and s2 */
+ polyvecl_uniform_eta(&s1, rhoprime, 0);
+ polyveck_uniform_eta(&s2, rhoprime, L);
+
+ /* Matrix-vector multiplication */
+ s1hat = s1;
+ polyvecl_ntt(&s1hat);
+ polyvec_matrix_pointwise_montgomery(&t1, mat, &s1hat);
+ polyveck_reduce(&t1);
+ polyveck_invntt_tomont(&t1);
+
+ /* Add error vector s2 */
+ polyveck_add(&t1, &t1, &s2);
+
+ /* Extract t1 and write public key */
+ polyveck_caddq(&t1);
+ polyveck_power2round(&t1, &t0, &t1);
+ pack_pk(pk, rho, &t1);
+
+ /* Compute H(rho, t1) and write secret key */
+ shake256(tr, SEEDBYTES, pk, CRYPTO_PUBLICKEYBYTES);
+ pack_sk(sk, rho, tr, key, &t0, &s1, &s2);
+
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_signature
+*
+* Description: Computes signature.
+*
+* Arguments: - uint8_t *sig: pointer to output signature (of length CRYPTO_BYTES)
+* - size_t *siglen: pointer to output length of signature
+* - uint8_t *m: pointer to message to be signed
+* - size_t mlen: length of message
+* - uint8_t *sk: pointer to bit-packed secret key
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign_signature(uint8_t *sig,
+ size_t *siglen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *sk)
+{
+ unsigned int n;
+ uint8_t seedbuf[3*SEEDBYTES + 2*CRHBYTES];
+ uint8_t *rho, *tr, *key, *mu, *rhoprime;
+ uint16_t nonce = 0;
+ polyvecl mat[K], s1, y, z;
+ polyveck t0, s2, w1, w0, h;
+ poly cp;
+ shake256incctx state;
+
+ rho = seedbuf;
+ tr = rho + SEEDBYTES;
+ key = tr + SEEDBYTES;
+ mu = key + SEEDBYTES;
+ rhoprime = mu + CRHBYTES;
+ unpack_sk(rho, tr, key, &t0, &s1, &s2, sk);
+
+ /* Compute CRH(tr, msg) */
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, tr, SEEDBYTES);
+ shake256_inc_absorb(&state, m, mlen);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(mu, CRHBYTES, &state);
+
+#ifdef DILITHIUM_RANDOMIZED_SIGNING
+ randombytes(rhoprime, CRHBYTES);
+#else
+ shake256(rhoprime, CRHBYTES, key, SEEDBYTES + CRHBYTES);
+#endif
+
+ /* Expand matrix and transform vectors */
+ polyvec_matrix_expand(mat, rho);
+ polyvecl_ntt(&s1);
+ polyveck_ntt(&s2);
+ polyveck_ntt(&t0);
+
+rej:
+ /* Sample intermediate vector y */
+ polyvecl_uniform_gamma1(&y, rhoprime, nonce++);
+
+ /* Matrix-vector multiplication */
+ z = y;
+ polyvecl_ntt(&z);
+ polyvec_matrix_pointwise_montgomery(&w1, mat, &z);
+ polyveck_reduce(&w1);
+ polyveck_invntt_tomont(&w1);
+
+ /* Decompose w and call the random oracle */
+ polyveck_caddq(&w1);
+ polyveck_decompose(&w1, &w0, &w1);
+ polyveck_pack_w1(sig, &w1);
+
+ shake256_inc_ctx_reset(&state);
+ shake256_inc_absorb(&state, mu, CRHBYTES);
+ shake256_inc_absorb(&state, sig, K*POLYW1_PACKEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(sig, SEEDBYTES, &state);
+ poly_challenge(&cp, sig);
+ poly_ntt(&cp);
+
+ /* Compute z, reject if it reveals secret */
+ polyvecl_pointwise_poly_montgomery(&z, &cp, &s1);
+ polyvecl_invntt_tomont(&z);
+ polyvecl_add(&z, &z, &y);
+ polyvecl_reduce(&z);
+ if(polyvecl_chknorm(&z, GAMMA1 - BETA))
+ goto rej;
+
+ /* Check that subtracting cs2 does not change high bits of w and low bits
+ * do not reveal secret information */
+ polyveck_pointwise_poly_montgomery(&h, &cp, &s2);
+ polyveck_invntt_tomont(&h);
+ polyveck_sub(&w0, &w0, &h);
+ polyveck_reduce(&w0);
+ if(polyveck_chknorm(&w0, GAMMA2 - BETA))
+ goto rej;
+
+ /* Compute hints for w1 */
+ polyveck_pointwise_poly_montgomery(&h, &cp, &t0);
+ polyveck_invntt_tomont(&h);
+ polyveck_reduce(&h);
+ if(polyveck_chknorm(&h, GAMMA2))
+ goto rej;
+
+ polyveck_add(&w0, &w0, &h);
+ n = polyveck_make_hint(&h, &w0, &w1);
+ if(n > OMEGA)
+ goto rej;
+
+ shake256_inc_ctx_release(&state);
+
+ /* Write signature */
+ pack_sig(sig, sig, &z, &h);
+ *siglen = CRYPTO_BYTES;
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign
+*
+* Description: Compute signed message.
+*
+* Arguments: - uint8_t *sm: pointer to output signed message (allocated
+* array with CRYPTO_BYTES + mlen bytes),
+* can be equal to m
+* - size_t *smlen: pointer to output length of signed
+* message
+* - const uint8_t *m: pointer to message to be signed
+* - size_t mlen: length of message
+* - const uint8_t *sk: pointer to bit-packed secret key
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign(uint8_t *sm,
+ size_t *smlen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *sk)
+{
+ size_t i;
+
+ for(i = 0; i < mlen; ++i)
+ sm[CRYPTO_BYTES + mlen - 1 - i] = m[mlen - 1 - i];
+ crypto_sign_signature(sm, smlen, sm + CRYPTO_BYTES, mlen, sk);
+ *smlen += mlen;
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_verify
+*
+* Description: Verifies signature.
+*
+* Arguments: - uint8_t *m: pointer to input signature
+* - size_t siglen: length of signature
+* - const uint8_t *m: pointer to message
+* - size_t mlen: length of message
+* - const uint8_t *pk: pointer to bit-packed public key
+*
+* Returns 0 if signature could be verified correctly and -1 otherwise
+**************************************************/
+int crypto_sign_verify(const uint8_t *sig,
+ size_t siglen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *pk)
+{
+ unsigned int i;
+ uint8_t buf[K*POLYW1_PACKEDBYTES];
+ uint8_t rho[SEEDBYTES];
+ uint8_t mu[CRHBYTES];
+ uint8_t c[SEEDBYTES];
+ uint8_t c2[SEEDBYTES];
+ poly cp;
+ polyvecl mat[K], z;
+ polyveck t1, w1, h;
+ shake256incctx state;
+
+ if(siglen != CRYPTO_BYTES)
+ return -1;
+
+ unpack_pk(rho, &t1, pk);
+ if(unpack_sig(c, &z, &h, sig))
+ return -1;
+ if(polyvecl_chknorm(&z, GAMMA1 - BETA))
+ return -1;
+
+ /* Compute CRH(H(rho, t1), msg) */
+ shake256(mu, SEEDBYTES, pk, CRYPTO_PUBLICKEYBYTES);
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, mu, SEEDBYTES);
+ shake256_inc_absorb(&state, m, mlen);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(mu, CRHBYTES, &state);
+
+ /* Matrix-vector multiplication; compute Az - c2^dt1 */
+ poly_challenge(&cp, c);
+ polyvec_matrix_expand(mat, rho);
+
+ polyvecl_ntt(&z);
+ polyvec_matrix_pointwise_montgomery(&w1, mat, &z);
+
+ poly_ntt(&cp);
+ polyveck_shiftl(&t1);
+ polyveck_ntt(&t1);
+ polyveck_pointwise_poly_montgomery(&t1, &cp, &t1);
+
+ polyveck_sub(&w1, &w1, &t1);
+ polyveck_reduce(&w1);
+ polyveck_invntt_tomont(&w1);
+
+ /* Reconstruct w1 */
+ polyveck_caddq(&w1);
+ polyveck_use_hint(&w1, &w1, &h);
+ polyveck_pack_w1(buf, &w1);
+
+ /* Call random oracle and verify challenge */
+ shake256_inc_ctx_reset(&state);
+ shake256_inc_absorb(&state, mu, CRHBYTES);
+ shake256_inc_absorb(&state, buf, K*POLYW1_PACKEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(c2, SEEDBYTES, &state);
+ shake256_inc_ctx_release(&state);
+ for(i = 0; i < SEEDBYTES; ++i)
+ if(c[i] != c2[i])
+ return -1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_open
+*
+* Description: Verify signed message.
+*
+* Arguments: - uint8_t *m: pointer to output message (allocated
+* array with smlen bytes), can be equal to sm
+* - size_t *mlen: pointer to output length of message
+* - const uint8_t *sm: pointer to signed message
+* - size_t smlen: length of signed message
+* - const uint8_t *pk: pointer to bit-packed public key
+*
+* Returns 0 if signed message could be verified correctly and -1 otherwise
+**************************************************/
+int crypto_sign_open(uint8_t *m,
+ size_t *mlen,
+ const uint8_t *sm,
+ size_t smlen,
+ const uint8_t *pk)
+{
+ size_t i;
+
+ if(smlen < CRYPTO_BYTES)
+ goto badsig;
+
+ *mlen = smlen - CRYPTO_BYTES;
+ if(crypto_sign_verify(sm, CRYPTO_BYTES, sm + CRYPTO_BYTES, *mlen, pk))
+ goto badsig;
+ else {
+ /* All good, copy msg, return 0 */
+ for(i = 0; i < *mlen; ++i)
+ m[i] = sm[CRYPTO_BYTES + i];
+ return 0;
+ }
+
+badsig:
+ /* Signature verification failed */
+ *mlen = -1;
+ for(i = 0; i < smlen; ++i)
+ m[i] = 0;
+
+ return -1;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.h
new file mode 100644
index 000000000..295f378c0
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/sign.h
@@ -0,0 +1,36 @@
+#ifndef SIGN_H
+#define SIGN_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+#include "poly.h"
+
+#define challenge DILITHIUM_NAMESPACE(challenge)
+void challenge(poly *c, const uint8_t seed[SEEDBYTES]);
+
+#define crypto_sign_keypair DILITHIUM_NAMESPACE(keypair)
+int crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
+
+#define crypto_sign_signature DILITHIUM_NAMESPACE(signature)
+int crypto_sign_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+#define crypto_sign DILITHIUM_NAMESPACETOP
+int crypto_sign(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+#define crypto_sign_verify DILITHIUM_NAMESPACE(verify)
+int crypto_sign_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+#define crypto_sign_open DILITHIUM_NAMESPACE(open)
+int crypto_sign_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric-shake.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric-shake.c
new file mode 100644
index 000000000..963f64981
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric-shake.c
@@ -0,0 +1,28 @@
+#include <stdint.h>
+#include "params.h"
+#include "symmetric.h"
+#include "fips202.h"
+
+void dilithium_shake128_stream_init(shake128incctx *state, const uint8_t seed[SEEDBYTES], uint16_t nonce)
+{
+ uint8_t t[2];
+ t[0] = nonce;
+ t[1] = nonce >> 8;
+
+ shake128_inc_init(state);
+ shake128_inc_absorb(state, seed, SEEDBYTES);
+ shake128_inc_absorb(state, t, 2);
+ shake128_inc_finalize(state);
+}
+
+void dilithium_shake256_stream_init(shake256incctx *state, const uint8_t seed[CRHBYTES], uint16_t nonce)
+{
+ uint8_t t[2];
+ t[0] = nonce;
+ t[1] = nonce >> 8;
+
+ shake256_inc_init(state);
+ shake256_inc_absorb(state, seed, CRHBYTES);
+ shake256_inc_absorb(state, t, 2);
+ shake256_inc_finalize(state);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric.h
new file mode 100644
index 000000000..eb24363f9
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/symmetric.h
@@ -0,0 +1,69 @@
+#ifndef SYMMETRIC_H
+#define SYMMETRIC_H
+
+#include <stdint.h>
+#include "params.h"
+
+#ifdef DILITHIUM_USE_AES
+
+#include "aes256ctr.h"
+#include "fips202.h"
+
+typedef aes256ctr_ctx stream128_state;
+typedef aes256ctr_ctx stream256_state;
+
+#define dilithium_aes256ctr_init DILITHIUM_NAMESPACE(dilithium_aes256ctr_init)
+void dilithium_aes256ctr_init(aes256ctr_ctx *state,
+ const uint8_t key[32],
+ uint16_t nonce);
+
+#define STREAM128_BLOCKBYTES AES256CTR_BLOCKBYTES
+#define STREAM256_BLOCKBYTES AES256CTR_BLOCKBYTES
+
+#define stream128_init(STATE, SEED, NONCE) \
+ dilithium_aes256ctr_init(STATE, SEED, NONCE)
+#define stream128_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ aes256ctr_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream128_release(STATE) \
+ aes256_ctx_release(STATE)
+#define stream256_init(STATE, SEED, NONCE) \
+ dilithium_aes256ctr_init(STATE, SEED, NONCE)
+#define stream256_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ aes256ctr_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream256_release(STATE) \
+ aes256_ctx_release(STATE)
+
+#else
+
+#include "fips202.h"
+
+typedef shake128incctx stream128_state;
+typedef shake256incctx stream256_state;
+
+#define dilithium_shake128_stream_init DILITHIUM_NAMESPACE(dilithium_shake128_stream_init)
+void dilithium_shake128_stream_init(shake128incctx *state,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce);
+
+#define dilithium_shake256_stream_init DILITHIUM_NAMESPACE(dilithium_shake256_stream_init)
+void dilithium_shake256_stream_init(shake256incctx *state,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+
+#define STREAM128_BLOCKBYTES SHAKE128_RATE
+#define STREAM256_BLOCKBYTES SHAKE256_RATE
+
+#define stream128_init(STATE, SEED, NONCE) \
+ dilithium_shake128_stream_init(STATE, SEED, NONCE)
+#define stream128_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ shake128_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream128_release(STATE) shake128_inc_ctx_release(STATE)
+#define stream256_init(STATE, SEED, NONCE) \
+ dilithium_shake256_stream_init(STATE, SEED, NONCE)
+#define stream256_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ shake256_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream256_release(STATE) shake256_inc_ctx_release(STATE)
+
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/Makefile b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/Makefile
new file mode 100644
index 000000000..fe090f3ff
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/Makefile
@@ -0,0 +1,49 @@
+#! gmake
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#######################################################################
+# (1) Include initial platform-independent assignments (MANDATORY). #
+#######################################################################
+
+include manifest.mn
+
+#######################################################################
+# (2) Include "global" configuration information. (OPTIONAL) #
+#######################################################################
+
+USE_GCOV =
+include $(CORE_DEPTH)/coreconf/config.mk
+
+#######################################################################
+# (3) Include "component" configuration information. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL). #
+#######################################################################
+
+include config.mk
+
+#######################################################################
+# (5) Execute "global" rules. (OPTIONAL) #
+#######################################################################
+
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+#######################################################################
+# (6) Execute "component" rules. (OPTIONAL) #
+#######################################################################
+
+
+
+#######################################################################
+# (7) Execute "local" rules. (OPTIONAL). #
+#######################################################################
+
+WARNING_CFLAGS = $(NULL)
+
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/api.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/api.h
new file mode 100644
index 000000000..ceeef106d
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/api.h
@@ -0,0 +1,152 @@
+#ifndef API_H
+#define API_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#define pqcrystals_dilithium2_PUBLICKEYBYTES 1312
+#define pqcrystals_dilithium2_SECRETKEYBYTES 2528
+#define pqcrystals_dilithium2_BYTES 2420
+
+#define pqcrystals_dilithium2_ref_PUBLICKEYBYTES pqcrystals_dilithium2_PUBLICKEYBYTES
+#define pqcrystals_dilithium2_ref_SECRETKEYBYTES pqcrystals_dilithium2_SECRETKEYBYTES
+#define pqcrystals_dilithium2_ref_BYTES pqcrystals_dilithium2_BYTES
+
+int pqcrystals_dilithium2_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium2_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium2_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium2aes_ref_PUBLICKEYBYTES pqcrystals_dilithium2_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium2aes_ref_SECRETKEYBYTES pqcrystals_dilithium2_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium2aes_ref_BYTES pqcrystals_dilithium2_ref_BYTES
+
+int pqcrystals_dilithium2aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium2aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium2aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium3_PUBLICKEYBYTES 1952
+#define pqcrystals_dilithium3_SECRETKEYBYTES 4000
+#define pqcrystals_dilithium3_BYTES 3293
+
+#define pqcrystals_dilithium3_ref_PUBLICKEYBYTES pqcrystals_dilithium3_PUBLICKEYBYTES
+#define pqcrystals_dilithium3_ref_SECRETKEYBYTES pqcrystals_dilithium3_SECRETKEYBYTES
+#define pqcrystals_dilithium3_ref_BYTES pqcrystals_dilithium3_BYTES
+
+int pqcrystals_dilithium3_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium3_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium3_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium3aes_ref_PUBLICKEYBYTES pqcrystals_dilithium3_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium3aes_ref_SECRETKEYBYTES pqcrystals_dilithium3_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium3aes_ref_BYTES pqcrystals_dilithium3_ref_BYTES
+
+int pqcrystals_dilithium3aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium3aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium3aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium5_PUBLICKEYBYTES 2592
+#define pqcrystals_dilithium5_SECRETKEYBYTES 4864
+#define pqcrystals_dilithium5_BYTES 4595
+
+#define pqcrystals_dilithium5_ref_PUBLICKEYBYTES pqcrystals_dilithium5_PUBLICKEYBYTES
+#define pqcrystals_dilithium5_ref_SECRETKEYBYTES pqcrystals_dilithium5_SECRETKEYBYTES
+#define pqcrystals_dilithium5_ref_BYTES pqcrystals_dilithium5_BYTES
+
+int pqcrystals_dilithium5_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium5_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium5_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#define pqcrystals_dilithium5aes_ref_PUBLICKEYBYTES pqcrystals_dilithium5_ref_PUBLICKEYBYTES
+#define pqcrystals_dilithium5aes_ref_SECRETKEYBYTES pqcrystals_dilithium5_ref_SECRETKEYBYTES
+#define pqcrystals_dilithium5aes_ref_BYTES pqcrystals_dilithium5_ref_BYTES
+
+int pqcrystals_dilithium5aes_ref_keypair(uint8_t *pk, uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+int pqcrystals_dilithium5aes_ref_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+int pqcrystals_dilithium5aes_ref_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.h
new file mode 100644
index 000000000..14b08e0f0
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.h
@@ -0,0 +1,44 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+//#define DILITHIUM_MODE 2
+//#define DILITHIUM_USE_AES
+//#define DILITHIUM_RANDOMIZED_SIGNING
+//#define USE_RDPMC
+//#define DBENCH
+
+#ifndef DILITHIUM_MODE
+#define DILITHIUM_MODE 2
+#endif
+
+#ifdef DILITHIUM_USE_AES
+#if DILITHIUM_MODE == 2
+#define CRYPTO_ALGNAME "Dilithium2-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium2aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium2aes_ref_##s
+#elif DILITHIUM_MODE == 3
+#define CRYPTO_ALGNAME "Dilithium3-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium3aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium3aes_ref_##s
+#elif DILITHIUM_MODE == 5
+#define CRYPTO_ALGNAME "Dilithium5-AES"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium5aes_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium5aes_ref_##s
+#endif
+#else
+#if DILITHIUM_MODE == 2
+#define CRYPTO_ALGNAME "Dilithium2"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium2_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium2_ref_##s
+#elif DILITHIUM_MODE == 3
+#define CRYPTO_ALGNAME "Dilithium3"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium3_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium3_ref_##s
+#elif DILITHIUM_MODE == 5
+#define CRYPTO_ALGNAME "Dilithium5"
+#define DILITHIUM_NAMESPACETOP pqcrystals_dilithium5_ref
+#define DILITHIUM_NAMESPACE(s) pqcrystals_dilithium5_ref_##s
+#endif
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.mk b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.mk
new file mode 100644
index 000000000..724730264
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/config.mk
@@ -0,0 +1,12 @@
+# DO NOT EDIT: generated from config.mk.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# add fixes for platform integration issues here.
+#
+# liboqs programs expect the public include files to be in oqs/xxxx,
+# So we put liboqs in it's own module, oqs, and point to the dist files
+INCLUDES += -I$(CORE_DEPTH)/lib/liboqs/src/common/pqclean_shims -I$(CORE_DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits
+DEFINES += -DDILITHIUM_MODE=5 -DDILITHIUM_RANDOMIZED_SIGNING
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/manifest.mn b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/manifest.mn
new file mode 100644
index 000000000..5e8dc2b57
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/manifest.mn
@@ -0,0 +1,30 @@
+# DO NOT EDIT: generated from manifest.mn.subdirs.template
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CORE_DEPTH = ../../../../../..
+
+MODULE = oqs
+
+LIBRARY_NAME = oqs_src_sig_dilithium_pqcrystals-dilithium_dilithium5_ref
+SHARED_LIBRARY = $(NULL)
+
+CSRCS = \
+ ntt.c \
+ packing.c \
+ poly.c \
+ polyvec.c \
+ reduce.c \
+ rounding.c \
+ sign.c \
+ symmetric-shake.c \
+ $(NULL)
+
+# only add module debugging in opt builds if DEBUG_PKCS11 is set
+ifdef DEBUG_PKCS11
+ DEFINES += -DDEBUG_MODULE
+endif
+
+# This part of the code, including all sub-dirs, can be optimized for size
+export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.c
new file mode 100644
index 000000000..5ea8b530e
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.c
@@ -0,0 +1,98 @@
+#include <stdint.h>
+#include "params.h"
+#include "ntt.h"
+#include "reduce.h"
+
+static const int32_t zetas[N] = {
+ 0, 25847, -2608894, -518909, 237124, -777960, -876248, 466468,
+ 1826347, 2353451, -359251, -2091905, 3119733, -2884855, 3111497, 2680103,
+ 2725464, 1024112, -1079900, 3585928, -549488, -1119584, 2619752, -2108549,
+ -2118186, -3859737, -1399561, -3277672, 1757237, -19422, 4010497, 280005,
+ 2706023, 95776, 3077325, 3530437, -1661693, -3592148, -2537516, 3915439,
+ -3861115, -3043716, 3574422, -2867647, 3539968, -300467, 2348700, -539299,
+ -1699267, -1643818, 3505694, -3821735, 3507263, -2140649, -1600420, 3699596,
+ 811944, 531354, 954230, 3881043, 3900724, -2556880, 2071892, -2797779,
+ -3930395, -1528703, -3677745, -3041255, -1452451, 3475950, 2176455, -1585221,
+ -1257611, 1939314, -4083598, -1000202, -3190144, -3157330, -3632928, 126922,
+ 3412210, -983419, 2147896, 2715295, -2967645, -3693493, -411027, -2477047,
+ -671102, -1228525, -22981, -1308169, -381987, 1349076, 1852771, -1430430,
+ -3343383, 264944, 508951, 3097992, 44288, -1100098, 904516, 3958618,
+ -3724342, -8578, 1653064, -3249728, 2389356, -210977, 759969, -1316856,
+ 189548, -3553272, 3159746, -1851402, -2409325, -177440, 1315589, 1341330,
+ 1285669, -1584928, -812732, -1439742, -3019102, -3881060, -3628969, 3839961,
+ 2091667, 3407706, 2316500, 3817976, -3342478, 2244091, -2446433, -3562462,
+ 266997, 2434439, -1235728, 3513181, -3520352, -3759364, -1197226, -3193378,
+ 900702, 1859098, 909542, 819034, 495491, -1613174, -43260, -522500,
+ -655327, -3122442, 2031748, 3207046, -3556995, -525098, -768622, -3595838,
+ 342297, 286988, -2437823, 4108315, 3437287, -3342277, 1735879, 203044,
+ 2842341, 2691481, -2590150, 1265009, 4055324, 1247620, 2486353, 1595974,
+ -3767016, 1250494, 2635921, -3548272, -2994039, 1869119, 1903435, -1050970,
+ -1333058, 1237275, -3318210, -1430225, -451100, 1312455, 3306115, -1962642,
+ -1279661, 1917081, -2546312, -1374803, 1500165, 777191, 2235880, 3406031,
+ -542412, -2831860, -1671176, -1846953, -2584293, -3724270, 594136, -3776993,
+ -2013608, 2432395, 2454455, -164721, 1957272, 3369112, 185531, -1207385,
+ -3183426, 162844, 1616392, 3014001, 810149, 1652634, -3694233, -1799107,
+ -3038916, 3523897, 3866901, 269760, 2213111, -975884, 1717735, 472078,
+ -426683, 1723600, -1803090, 1910376, -1667432, -1104333, -260646, -3833893,
+ -2939036, -2235985, -420899, -2286327, 183443, -976891, 1612842, -3545687,
+ -554416, 3919660, -48306, -1362209, 3937738, 1400424, -846154, 1976782
+};
+
+/*************************************************
+* Name: ntt
+*
+* Description: Forward NTT, in-place. No modular reduction is performed after
+* additions or subtractions. Output vector is in bitreversed order.
+*
+* Arguments: - uint32_t p[N]: input/output coefficient array
+**************************************************/
+void ntt(int32_t a[N]) {
+ unsigned int len, start, j, k;
+ int32_t zeta, t;
+
+ k = 0;
+ for(len = 128; len > 0; len >>= 1) {
+ for(start = 0; start < N; start = j + len) {
+ zeta = zetas[++k];
+ for(j = start; j < start + len; ++j) {
+ t = montgomery_reduce((int64_t)zeta * a[j + len]);
+ a[j + len] = a[j] - t;
+ a[j] = a[j] + t;
+ }
+ }
+ }
+}
+
+/*************************************************
+* Name: invntt_tomont
+*
+* Description: Inverse NTT and multiplication by Montgomery factor 2^32.
+* In-place. No modular reductions after additions or
+* subtractions; input coefficients need to be smaller than
+* Q in absolute value. Output coefficient are smaller than Q in
+* absolute value.
+*
+* Arguments: - uint32_t p[N]: input/output coefficient array
+**************************************************/
+void invntt_tomont(int32_t a[N]) {
+ unsigned int start, len, j, k;
+ int32_t t, zeta;
+ const int32_t f = 41978; // mont^2/256
+
+ k = 256;
+ for(len = 1; len < N; len <<= 1) {
+ for(start = 0; start < N; start = j + len) {
+ zeta = -zetas[--k];
+ for(j = start; j < start + len; ++j) {
+ t = a[j];
+ a[j] = t + a[j + len];
+ a[j + len] = t - a[j + len];
+ a[j + len] = montgomery_reduce((int64_t)zeta * a[j + len]);
+ }
+ }
+ }
+
+ for(j = 0; j < N; ++j) {
+ a[j] = montgomery_reduce((int64_t)f * a[j]);
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.h
new file mode 100644
index 000000000..731132d5c
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/ntt.h
@@ -0,0 +1,13 @@
+#ifndef NTT_H
+#define NTT_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define ntt DILITHIUM_NAMESPACE(ntt)
+void ntt(int32_t a[N]);
+
+#define invntt_tomont DILITHIUM_NAMESPACE(invntt_tomont)
+void invntt_tomont(int32_t a[N]);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.c
new file mode 100644
index 000000000..9de5826cd
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.c
@@ -0,0 +1,237 @@
+#include "params.h"
+#include "packing.h"
+#include "polyvec.h"
+#include "poly.h"
+
+/*************************************************
+* Name: pack_pk
+*
+* Description: Bit-pack public key pk = (rho, t1).
+*
+* Arguments: - uint8_t pk[]: output byte array
+* - const uint8_t rho[]: byte array containing rho
+* - const polyveck *t1: pointer to vector t1
+**************************************************/
+void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const polyveck *t1)
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ pk[i] = rho[i];
+ pk += SEEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt1_pack(pk + i*POLYT1_PACKEDBYTES, &t1->vec[i]);
+}
+
+/*************************************************
+* Name: unpack_pk
+*
+* Description: Unpack public key pk = (rho, t1).
+*
+* Arguments: - const uint8_t rho[]: output byte array for rho
+* - const polyveck *t1: pointer to output vector t1
+* - uint8_t pk[]: byte array containing bit-packed pk
+**************************************************/
+void unpack_pk(uint8_t rho[SEEDBYTES],
+ polyveck *t1,
+ const uint8_t pk[CRYPTO_PUBLICKEYBYTES])
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ rho[i] = pk[i];
+ pk += SEEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt1_unpack(&t1->vec[i], pk + i*POLYT1_PACKEDBYTES);
+}
+
+/*************************************************
+* Name: pack_sk
+*
+* Description: Bit-pack secret key sk = (rho, tr, key, t0, s1, s2).
+*
+* Arguments: - uint8_t sk[]: output byte array
+* - const uint8_t rho[]: byte array containing rho
+* - const uint8_t tr[]: byte array containing tr
+* - const uint8_t key[]: byte array containing key
+* - const polyveck *t0: pointer to vector t0
+* - const polyvecl *s1: pointer to vector s1
+* - const polyveck *s2: pointer to vector s2
+**************************************************/
+void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const uint8_t tr[SEEDBYTES],
+ const uint8_t key[SEEDBYTES],
+ const polyveck *t0,
+ const polyvecl *s1,
+ const polyveck *s2)
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = rho[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = key[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ sk[i] = tr[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyeta_pack(sk + i*POLYETA_PACKEDBYTES, &s1->vec[i]);
+ sk += L*POLYETA_PACKEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyeta_pack(sk + i*POLYETA_PACKEDBYTES, &s2->vec[i]);
+ sk += K*POLYETA_PACKEDBYTES;
+
+ for(i = 0; i < K; ++i)
+ polyt0_pack(sk + i*POLYT0_PACKEDBYTES, &t0->vec[i]);
+}
+
+/*************************************************
+* Name: unpack_sk
+*
+* Description: Unpack secret key sk = (rho, tr, key, t0, s1, s2).
+*
+* Arguments: - const uint8_t rho[]: output byte array for rho
+* - const uint8_t tr[]: output byte array for tr
+* - const uint8_t key[]: output byte array for key
+* - const polyveck *t0: pointer to output vector t0
+* - const polyvecl *s1: pointer to output vector s1
+* - const polyveck *s2: pointer to output vector s2
+* - uint8_t sk[]: byte array containing bit-packed sk
+**************************************************/
+void unpack_sk(uint8_t rho[SEEDBYTES],
+ uint8_t tr[SEEDBYTES],
+ uint8_t key[SEEDBYTES],
+ polyveck *t0,
+ polyvecl *s1,
+ polyveck *s2,
+ const uint8_t sk[CRYPTO_SECRETKEYBYTES])
+{
+ unsigned int i;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ rho[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ key[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ tr[i] = sk[i];
+ sk += SEEDBYTES;
+
+ for(i=0; i < L; ++i)
+ polyeta_unpack(&s1->vec[i], sk + i*POLYETA_PACKEDBYTES);
+ sk += L*POLYETA_PACKEDBYTES;
+
+ for(i=0; i < K; ++i)
+ polyeta_unpack(&s2->vec[i], sk + i*POLYETA_PACKEDBYTES);
+ sk += K*POLYETA_PACKEDBYTES;
+
+ for(i=0; i < K; ++i)
+ polyt0_unpack(&t0->vec[i], sk + i*POLYT0_PACKEDBYTES);
+}
+
+/*************************************************
+* Name: pack_sig
+*
+* Description: Bit-pack signature sig = (c, z, h).
+*
+* Arguments: - uint8_t sig[]: output byte array
+* - const uint8_t *c: pointer to challenge hash length SEEDBYTES
+* - const polyvecl *z: pointer to vector z
+* - const polyveck *h: pointer to hint vector h
+**************************************************/
+void pack_sig(uint8_t sig[CRYPTO_BYTES],
+ const uint8_t c[SEEDBYTES],
+ const polyvecl *z,
+ const polyveck *h)
+{
+ unsigned int i, j, k;
+
+ for(i=0; i < SEEDBYTES; ++i)
+ sig[i] = c[i];
+ sig += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyz_pack(sig + i*POLYZ_PACKEDBYTES, &z->vec[i]);
+ sig += L*POLYZ_PACKEDBYTES;
+
+ /* Encode h */
+ for(i = 0; i < OMEGA + K; ++i)
+ sig[i] = 0;
+
+ k = 0;
+ for(i = 0; i < K; ++i) {
+ for(j = 0; j < N; ++j)
+ if(h->vec[i].coeffs[j] != 0)
+ sig[k++] = j;
+
+ sig[OMEGA + i] = k;
+ }
+}
+
+/*************************************************
+* Name: unpack_sig
+*
+* Description: Unpack signature sig = (c, z, h).
+*
+* Arguments: - uint8_t *c: pointer to output challenge hash
+* - polyvecl *z: pointer to output vector z
+* - polyveck *h: pointer to output hint vector h
+* - const uint8_t sig[]: byte array containing
+* bit-packed signature
+*
+* Returns 1 in case of malformed signature; otherwise 0.
+**************************************************/
+int unpack_sig(uint8_t c[SEEDBYTES],
+ polyvecl *z,
+ polyveck *h,
+ const uint8_t sig[CRYPTO_BYTES])
+{
+ unsigned int i, j, k;
+
+ for(i = 0; i < SEEDBYTES; ++i)
+ c[i] = sig[i];
+ sig += SEEDBYTES;
+
+ for(i = 0; i < L; ++i)
+ polyz_unpack(&z->vec[i], sig + i*POLYZ_PACKEDBYTES);
+ sig += L*POLYZ_PACKEDBYTES;
+
+ /* Decode h */
+ k = 0;
+ for(i = 0; i < K; ++i) {
+ for(j = 0; j < N; ++j)
+ h->vec[i].coeffs[j] = 0;
+
+ if(sig[OMEGA + i] < k || sig[OMEGA + i] > OMEGA)
+ return 1;
+
+ for(j = k; j < sig[OMEGA + i]; ++j) {
+ /* Coefficients are ordered for strong unforgeability */
+ if(j > k && sig[j] <= sig[j-1]) return 1;
+ h->vec[i].coeffs[sig[j]] = 1;
+ }
+
+ k = sig[OMEGA + i];
+ }
+
+ /* Extra indices are zero for strong unforgeability */
+ for(j = k; j < OMEGA; ++j)
+ if(sig[j])
+ return 1;
+
+ return 0;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.h
new file mode 100644
index 000000000..7c7cb6f4c
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/packing.h
@@ -0,0 +1,38 @@
+#ifndef PACKING_H
+#define PACKING_H
+
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+
+#define pack_pk DILITHIUM_NAMESPACE(pack_pk)
+void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES], const uint8_t rho[SEEDBYTES], const polyveck *t1);
+
+#define pack_sk DILITHIUM_NAMESPACE(pack_sk)
+void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
+ const uint8_t rho[SEEDBYTES],
+ const uint8_t tr[SEEDBYTES],
+ const uint8_t key[SEEDBYTES],
+ const polyveck *t0,
+ const polyvecl *s1,
+ const polyveck *s2);
+
+#define pack_sig DILITHIUM_NAMESPACE(pack_sig)
+void pack_sig(uint8_t sig[CRYPTO_BYTES], const uint8_t c[SEEDBYTES], const polyvecl *z, const polyveck *h);
+
+#define unpack_pk DILITHIUM_NAMESPACE(unpack_pk)
+void unpack_pk(uint8_t rho[SEEDBYTES], polyveck *t1, const uint8_t pk[CRYPTO_PUBLICKEYBYTES]);
+
+#define unpack_sk DILITHIUM_NAMESPACE(unpack_sk)
+void unpack_sk(uint8_t rho[SEEDBYTES],
+ uint8_t tr[SEEDBYTES],
+ uint8_t key[SEEDBYTES],
+ polyveck *t0,
+ polyvecl *s1,
+ polyveck *s2,
+ const uint8_t sk[CRYPTO_SECRETKEYBYTES]);
+
+#define unpack_sig DILITHIUM_NAMESPACE(unpack_sig)
+int unpack_sig(uint8_t c[SEEDBYTES], polyvecl *z, polyveck *h, const uint8_t sig[CRYPTO_BYTES]);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/params.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/params.h
new file mode 100644
index 000000000..63b02e2db
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/params.h
@@ -0,0 +1,74 @@
+#ifndef PARAMS_H
+#define PARAMS_H
+
+#include "config.h"
+
+#define SEEDBYTES 32
+#define CRHBYTES 64
+#define N 256
+#define Q 8380417
+#define D 13
+#define ROOT_OF_UNITY 1753
+
+#if DILITHIUM_MODE == 2
+#define K 4
+#define L 4
+#define ETA 2
+#define TAU 39
+#define BETA 78
+#define GAMMA1 (1 << 17)
+#define GAMMA2 ((Q-1)/88)
+#define OMEGA 80
+
+#elif DILITHIUM_MODE == 3
+#define K 6
+#define L 5
+#define ETA 4
+#define TAU 49
+#define BETA 196
+#define GAMMA1 (1 << 19)
+#define GAMMA2 ((Q-1)/32)
+#define OMEGA 55
+
+#elif DILITHIUM_MODE == 5
+#define K 8
+#define L 7
+#define ETA 2
+#define TAU 60
+#define BETA 120
+#define GAMMA1 (1 << 19)
+#define GAMMA2 ((Q-1)/32)
+#define OMEGA 75
+
+#endif
+
+#define POLYT1_PACKEDBYTES 320
+#define POLYT0_PACKEDBYTES 416
+#define POLYVECH_PACKEDBYTES (OMEGA + K)
+
+#if GAMMA1 == (1 << 17)
+#define POLYZ_PACKEDBYTES 576
+#elif GAMMA1 == (1 << 19)
+#define POLYZ_PACKEDBYTES 640
+#endif
+
+#if GAMMA2 == (Q-1)/88
+#define POLYW1_PACKEDBYTES 192
+#elif GAMMA2 == (Q-1)/32
+#define POLYW1_PACKEDBYTES 128
+#endif
+
+#if ETA == 2
+#define POLYETA_PACKEDBYTES 96
+#elif ETA == 4
+#define POLYETA_PACKEDBYTES 128
+#endif
+
+#define CRYPTO_PUBLICKEYBYTES (SEEDBYTES + K*POLYT1_PACKEDBYTES)
+#define CRYPTO_SECRETKEYBYTES (3*SEEDBYTES \
+ + L*POLYETA_PACKEDBYTES \
+ + K*POLYETA_PACKEDBYTES \
+ + K*POLYT0_PACKEDBYTES)
+#define CRYPTO_BYTES (SEEDBYTES + L*POLYZ_PACKEDBYTES + POLYVECH_PACKEDBYTES)
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.c
new file mode 100644
index 000000000..006e83c93
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.c
@@ -0,0 +1,911 @@
+#include <stdint.h>
+#include "params.h"
+#include "poly.h"
+#include "ntt.h"
+#include "reduce.h"
+#include "rounding.h"
+#include "symmetric.h"
+
+#ifdef DBENCH
+#include "test/cpucycles.h"
+extern const uint64_t timing_overhead;
+extern uint64_t *tred, *tadd, *tmul, *tround, *tsample, *tpack;
+#define DBENCH_START() uint64_t time = cpucycles()
+#define DBENCH_STOP(t) t += cpucycles() - time - timing_overhead
+#else
+#define DBENCH_START()
+#define DBENCH_STOP(t)
+#endif
+
+/*************************************************
+* Name: poly_reduce
+*
+* Description: Inplace reduction of all coefficients of polynomial to
+* representative in [-6283009,6283007].
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_reduce(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] = reduce32(a->coeffs[i]);
+
+ DBENCH_STOP(*tred);
+}
+
+/*************************************************
+* Name: poly_caddq
+*
+* Description: For all coefficients of in/out polynomial add Q if
+* coefficient is negative.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_caddq(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] = caddq(a->coeffs[i]);
+
+ DBENCH_STOP(*tred);
+}
+
+/*************************************************
+* Name: poly_add
+*
+* Description: Add polynomials. No modular reduction is performed.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first summand
+* - const poly *b: pointer to second summand
+**************************************************/
+void poly_add(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = a->coeffs[i] + b->coeffs[i];
+
+ DBENCH_STOP(*tadd);
+}
+
+/*************************************************
+* Name: poly_sub
+*
+* Description: Subtract polynomials. No modular reduction is
+* performed.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first input polynomial
+* - const poly *b: pointer to second input polynomial to be
+* subtraced from first input polynomial
+**************************************************/
+void poly_sub(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = a->coeffs[i] - b->coeffs[i];
+
+ DBENCH_STOP(*tadd);
+}
+
+/*************************************************
+* Name: poly_shiftl
+*
+* Description: Multiply polynomial by 2^D without modular reduction. Assumes
+* input coefficients to be less than 2^{31-D} in absolute value.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_shiftl(poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a->coeffs[i] <<= D;
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_ntt
+*
+* Description: Inplace forward NTT. Coefficients can grow by
+* 8*Q in absolute value.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_ntt(poly *a) {
+ DBENCH_START();
+
+ ntt(a->coeffs);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_invntt_tomont
+*
+* Description: Inplace inverse NTT and multiplication by 2^{32}.
+* Input coefficients need to be less than Q in absolute
+* value and output coefficients are again bounded by Q.
+*
+* Arguments: - poly *a: pointer to input/output polynomial
+**************************************************/
+void poly_invntt_tomont(poly *a) {
+ DBENCH_START();
+
+ invntt_tomont(a->coeffs);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_pointwise_montgomery
+*
+* Description: Pointwise multiplication of polynomials in NTT domain
+* representation and multiplication of resulting polynomial
+* by 2^{-32}.
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const poly *a: pointer to first input polynomial
+* - const poly *b: pointer to second input polynomial
+**************************************************/
+void poly_pointwise_montgomery(poly *c, const poly *a, const poly *b) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = montgomery_reduce((int64_t)a->coeffs[i] * b->coeffs[i]);
+
+ DBENCH_STOP(*tmul);
+}
+
+/*************************************************
+* Name: poly_power2round
+*
+* Description: For all coefficients c of the input polynomial,
+* compute c0, c1 such that c mod Q = c1*2^D + c0
+* with -2^{D-1} < c0 <= 2^{D-1}. Assumes coefficients to be
+* standard representatives.
+*
+* Arguments: - poly *a1: pointer to output polynomial with coefficients c1
+* - poly *a0: pointer to output polynomial with coefficients c0
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void poly_power2round(poly *a1, poly *a0, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a1->coeffs[i] = power2round(&a0->coeffs[i], a->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_decompose
+*
+* Description: For all coefficients c of the input polynomial,
+* compute high and low bits c0, c1 such c mod Q = c1*ALPHA + c0
+* with -ALPHA/2 < c0 <= ALPHA/2 except c1 = (Q-1)/ALPHA where we
+* set c1 = 0 and -ALPHA/2 <= c0 = c mod Q - Q < 0.
+* Assumes coefficients to be standard representatives.
+*
+* Arguments: - poly *a1: pointer to output polynomial with coefficients c1
+* - poly *a0: pointer to output polynomial with coefficients c0
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void poly_decompose(poly *a1, poly *a0, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ a1->coeffs[i] = decompose(&a0->coeffs[i], a->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_make_hint
+*
+* Description: Compute hint polynomial. The coefficients of which indicate
+* whether the low bits of the corresponding coefficient of
+* the input polynomial overflow into the high bits.
+*
+* Arguments: - poly *h: pointer to output hint polynomial
+* - const poly *a0: pointer to low part of input polynomial
+* - const poly *a1: pointer to high part of input polynomial
+*
+* Returns number of 1 bits.
+**************************************************/
+unsigned int poly_make_hint(poly *h, const poly *a0, const poly *a1) {
+ unsigned int i, s = 0;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i) {
+ h->coeffs[i] = make_hint(a0->coeffs[i], a1->coeffs[i]);
+ s += h->coeffs[i];
+ }
+
+ DBENCH_STOP(*tround);
+ return s;
+}
+
+/*************************************************
+* Name: poly_use_hint
+*
+* Description: Use hint polynomial to correct the high bits of a polynomial.
+*
+* Arguments: - poly *b: pointer to output polynomial with corrected high bits
+* - const poly *a: pointer to input polynomial
+* - const poly *h: pointer to input hint polynomial
+**************************************************/
+void poly_use_hint(poly *b, const poly *a, const poly *h) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N; ++i)
+ b->coeffs[i] = use_hint(a->coeffs[i], h->coeffs[i]);
+
+ DBENCH_STOP(*tround);
+}
+
+/*************************************************
+* Name: poly_chknorm
+*
+* Description: Check infinity norm of polynomial against given bound.
+* Assumes input coefficients were reduced by reduce32().
+*
+* Arguments: - const poly *a: pointer to polynomial
+* - int32_t B: norm bound
+*
+* Returns 0 if norm is strictly smaller than B <= (Q-1)/8 and 1 otherwise.
+**************************************************/
+int poly_chknorm(const poly *a, int32_t B) {
+ unsigned int i;
+ int32_t t;
+ DBENCH_START();
+
+ if(B > (Q-1)/8)
+ return 1;
+
+ /* It is ok to leak which coefficient violates the bound since
+ the probability for each coefficient is independent of secret
+ data but we must not leak the sign of the centralized representative. */
+ for(i = 0; i < N; ++i) {
+ /* Absolute value */
+ t = a->coeffs[i] >> 31;
+ t = a->coeffs[i] - (t & 2*a->coeffs[i]);
+
+ if(t >= B) {
+ DBENCH_STOP(*tsample);
+ return 1;
+ }
+ }
+
+ DBENCH_STOP(*tsample);
+ return 0;
+}
+
+/*************************************************
+* Name: rej_uniform
+*
+* Description: Sample uniformly random coefficients in [0, Q-1] by
+* performing rejection sampling on array of random bytes.
+*
+* Arguments: - int32_t *a: pointer to output array (allocated)
+* - unsigned int len: number of coefficients to be sampled
+* - const uint8_t *buf: array of random bytes
+* - unsigned int buflen: length of array of random bytes
+*
+* Returns number of sampled coefficients. Can be smaller than len if not enough
+* random bytes were given.
+**************************************************/
+static unsigned int rej_uniform(int32_t *a,
+ unsigned int len,
+ const uint8_t *buf,
+ unsigned int buflen)
+{
+ unsigned int ctr, pos;
+ uint32_t t;
+ DBENCH_START();
+
+ ctr = pos = 0;
+ while(ctr < len && pos + 3 <= buflen) {
+ t = buf[pos++];
+ t |= (uint32_t)buf[pos++] << 8;
+ t |= (uint32_t)buf[pos++] << 16;
+ t &= 0x7FFFFF;
+
+ if(t < Q)
+ a[ctr++] = t;
+ }
+
+ DBENCH_STOP(*tsample);
+ return ctr;
+}
+
+/*************************************************
+* Name: poly_uniform
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [0,Q-1] by performing rejection sampling on the
+* output stream of SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length SEEDBYTES
+* - uint16_t nonce: 2-byte nonce
+**************************************************/
+#define POLY_UNIFORM_NBLOCKS ((768 + STREAM128_BLOCKBYTES - 1)/STREAM128_BLOCKBYTES)
+void poly_uniform(poly *a,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce)
+{
+ unsigned int i, ctr, off;
+ unsigned int buflen = POLY_UNIFORM_NBLOCKS*STREAM128_BLOCKBYTES;
+ uint8_t buf[POLY_UNIFORM_NBLOCKS*STREAM128_BLOCKBYTES + 2];
+ stream128_state state;
+
+ stream128_init(&state, seed, nonce);
+ stream128_squeezeblocks(buf, POLY_UNIFORM_NBLOCKS, &state);
+
+ ctr = rej_uniform(a->coeffs, N, buf, buflen);
+
+ while(ctr < N) {
+ off = buflen % 3;
+ for(i = 0; i < off; ++i)
+ buf[i] = buf[buflen - off + i];
+
+ stream128_squeezeblocks(buf + off, 1, &state);
+ buflen = STREAM128_BLOCKBYTES + off;
+ ctr += rej_uniform(a->coeffs + ctr, N - ctr, buf, buflen);
+ }
+ stream128_release(&state);
+}
+
+/*************************************************
+* Name: rej_eta
+*
+* Description: Sample uniformly random coefficients in [-ETA, ETA] by
+* performing rejection sampling on array of random bytes.
+*
+* Arguments: - int32_t *a: pointer to output array (allocated)
+* - unsigned int len: number of coefficients to be sampled
+* - const uint8_t *buf: array of random bytes
+* - unsigned int buflen: length of array of random bytes
+*
+* Returns number of sampled coefficients. Can be smaller than len if not enough
+* random bytes were given.
+**************************************************/
+static unsigned int rej_eta(int32_t *a,
+ unsigned int len,
+ const uint8_t *buf,
+ unsigned int buflen)
+{
+ unsigned int ctr, pos;
+ uint32_t t0, t1;
+ DBENCH_START();
+
+ ctr = pos = 0;
+ while(ctr < len && pos < buflen) {
+ t0 = buf[pos] & 0x0F;
+ t1 = buf[pos++] >> 4;
+
+#if ETA == 2
+ if(t0 < 15) {
+ t0 = t0 - (205*t0 >> 10)*5;
+ a[ctr++] = 2 - t0;
+ }
+ if(t1 < 15 && ctr < len) {
+ t1 = t1 - (205*t1 >> 10)*5;
+ a[ctr++] = 2 - t1;
+ }
+#elif ETA == 4
+ if(t0 < 9)
+ a[ctr++] = 4 - t0;
+ if(t1 < 9 && ctr < len)
+ a[ctr++] = 4 - t1;
+#endif
+ }
+
+ DBENCH_STOP(*tsample);
+ return ctr;
+}
+
+/*************************************************
+* Name: poly_uniform_eta
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [-ETA,ETA] by performing rejection sampling on the
+* output stream from SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length CRHBYTES
+* - uint16_t nonce: 2-byte nonce
+**************************************************/
+#if ETA == 2
+#define POLY_UNIFORM_ETA_NBLOCKS ((136 + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+#elif ETA == 4
+#define POLY_UNIFORM_ETA_NBLOCKS ((227 + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+#endif
+void poly_uniform_eta(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce)
+{
+ unsigned int ctr;
+ unsigned int buflen = POLY_UNIFORM_ETA_NBLOCKS*STREAM256_BLOCKBYTES;
+ uint8_t buf[POLY_UNIFORM_ETA_NBLOCKS*STREAM256_BLOCKBYTES];
+ stream256_state state;
+
+ stream256_init(&state, seed, nonce);
+ stream256_squeezeblocks(buf, POLY_UNIFORM_ETA_NBLOCKS, &state);
+
+ ctr = rej_eta(a->coeffs, N, buf, buflen);
+
+ while(ctr < N) {
+ stream256_squeezeblocks(buf, 1, &state);
+ ctr += rej_eta(a->coeffs + ctr, N - ctr, buf, STREAM256_BLOCKBYTES);
+ }
+ stream256_release(&state);
+}
+
+/*************************************************
+* Name: poly_uniform_gamma1m1
+*
+* Description: Sample polynomial with uniformly random coefficients
+* in [-(GAMMA1 - 1), GAMMA1] by unpacking output stream
+* of SHAKE256(seed|nonce) or AES256CTR(seed,nonce).
+*
+* Arguments: - poly *a: pointer to output polynomial
+* - const uint8_t seed[]: byte array with seed of length CRHBYTES
+* - uint16_t nonce: 16-bit nonce
+**************************************************/
+#define POLY_UNIFORM_GAMMA1_NBLOCKS ((POLYZ_PACKEDBYTES + STREAM256_BLOCKBYTES - 1)/STREAM256_BLOCKBYTES)
+void poly_uniform_gamma1(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce)
+{
+ uint8_t buf[POLY_UNIFORM_GAMMA1_NBLOCKS*STREAM256_BLOCKBYTES];
+ stream256_state state;
+
+ stream256_init(&state, seed, nonce);
+ stream256_squeezeblocks(buf, POLY_UNIFORM_GAMMA1_NBLOCKS, &state);
+ stream256_release(&state);
+ polyz_unpack(a, buf);
+}
+
+/*************************************************
+* Name: challenge
+*
+* Description: Implementation of H. Samples polynomial with TAU nonzero
+* coefficients in {-1,1} using the output stream of
+* SHAKE256(seed).
+*
+* Arguments: - poly *c: pointer to output polynomial
+* - const uint8_t mu[]: byte array containing seed of length SEEDBYTES
+**************************************************/
+void poly_challenge(poly *c, const uint8_t seed[SEEDBYTES]) {
+ unsigned int i, b, pos;
+ uint64_t signs;
+ uint8_t buf[SHAKE256_RATE];
+ shake256incctx state;
+
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, seed, SEEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_squeezeblocks(buf, 1, &state);
+
+ signs = 0;
+ for(i = 0; i < 8; ++i)
+ signs |= (uint64_t)buf[i] << 8*i;
+ pos = 8;
+
+ for(i = 0; i < N; ++i)
+ c->coeffs[i] = 0;
+ for(i = N-TAU; i < N; ++i) {
+ do {
+ if(pos >= SHAKE256_RATE) {
+ shake256_squeezeblocks(buf, 1, &state);
+ pos = 0;
+ }
+
+ b = buf[pos++];
+ } while(b > i);
+
+ c->coeffs[i] = c->coeffs[b];
+ c->coeffs[b] = 1 - 2*(signs & 1);
+ signs >>= 1;
+ }
+ shake256_inc_ctx_release(&state);
+}
+
+/*************************************************
+* Name: polyeta_pack
+*
+* Description: Bit-pack polynomial with coefficients in [-ETA,ETA].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYETA_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyeta_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint8_t t[8];
+ DBENCH_START();
+
+#if ETA == 2
+ for(i = 0; i < N/8; ++i) {
+ t[0] = ETA - a->coeffs[8*i+0];
+ t[1] = ETA - a->coeffs[8*i+1];
+ t[2] = ETA - a->coeffs[8*i+2];
+ t[3] = ETA - a->coeffs[8*i+3];
+ t[4] = ETA - a->coeffs[8*i+4];
+ t[5] = ETA - a->coeffs[8*i+5];
+ t[6] = ETA - a->coeffs[8*i+6];
+ t[7] = ETA - a->coeffs[8*i+7];
+
+ r[3*i+0] = (t[0] >> 0) | (t[1] << 3) | (t[2] << 6);
+ r[3*i+1] = (t[2] >> 2) | (t[3] << 1) | (t[4] << 4) | (t[5] << 7);
+ r[3*i+2] = (t[5] >> 1) | (t[6] << 2) | (t[7] << 5);
+ }
+#elif ETA == 4
+ for(i = 0; i < N/2; ++i) {
+ t[0] = ETA - a->coeffs[2*i+0];
+ t[1] = ETA - a->coeffs[2*i+1];
+ r[i] = t[0] | (t[1] << 4);
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyeta_unpack
+*
+* Description: Unpack polynomial with coefficients in [-ETA,ETA].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyeta_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if ETA == 2
+ for(i = 0; i < N/8; ++i) {
+ r->coeffs[8*i+0] = (a[3*i+0] >> 0) & 7;
+ r->coeffs[8*i+1] = (a[3*i+0] >> 3) & 7;
+ r->coeffs[8*i+2] = ((a[3*i+0] >> 6) | (a[3*i+1] << 2)) & 7;
+ r->coeffs[8*i+3] = (a[3*i+1] >> 1) & 7;
+ r->coeffs[8*i+4] = (a[3*i+1] >> 4) & 7;
+ r->coeffs[8*i+5] = ((a[3*i+1] >> 7) | (a[3*i+2] << 1)) & 7;
+ r->coeffs[8*i+6] = (a[3*i+2] >> 2) & 7;
+ r->coeffs[8*i+7] = (a[3*i+2] >> 5) & 7;
+
+ r->coeffs[8*i+0] = ETA - r->coeffs[8*i+0];
+ r->coeffs[8*i+1] = ETA - r->coeffs[8*i+1];
+ r->coeffs[8*i+2] = ETA - r->coeffs[8*i+2];
+ r->coeffs[8*i+3] = ETA - r->coeffs[8*i+3];
+ r->coeffs[8*i+4] = ETA - r->coeffs[8*i+4];
+ r->coeffs[8*i+5] = ETA - r->coeffs[8*i+5];
+ r->coeffs[8*i+6] = ETA - r->coeffs[8*i+6];
+ r->coeffs[8*i+7] = ETA - r->coeffs[8*i+7];
+ }
+#elif ETA == 4
+ for(i = 0; i < N/2; ++i) {
+ r->coeffs[2*i+0] = a[i] & 0x0F;
+ r->coeffs[2*i+1] = a[i] >> 4;
+ r->coeffs[2*i+0] = ETA - r->coeffs[2*i+0];
+ r->coeffs[2*i+1] = ETA - r->coeffs[2*i+1];
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt1_pack
+*
+* Description: Bit-pack polynomial t1 with coefficients fitting in 10 bits.
+* Input coefficients are assumed to be standard representatives.
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYT1_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyt1_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/4; ++i) {
+ r[5*i+0] = (a->coeffs[4*i+0] >> 0);
+ r[5*i+1] = (a->coeffs[4*i+0] >> 8) | (a->coeffs[4*i+1] << 2);
+ r[5*i+2] = (a->coeffs[4*i+1] >> 6) | (a->coeffs[4*i+2] << 4);
+ r[5*i+3] = (a->coeffs[4*i+2] >> 4) | (a->coeffs[4*i+3] << 6);
+ r[5*i+4] = (a->coeffs[4*i+3] >> 2);
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt1_unpack
+*
+* Description: Unpack polynomial t1 with 10-bit coefficients.
+* Output coefficients are standard representatives.
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyt1_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/4; ++i) {
+ r->coeffs[4*i+0] = ((a[5*i+0] >> 0) | ((uint32_t)a[5*i+1] << 8)) & 0x3FF;
+ r->coeffs[4*i+1] = ((a[5*i+1] >> 2) | ((uint32_t)a[5*i+2] << 6)) & 0x3FF;
+ r->coeffs[4*i+2] = ((a[5*i+2] >> 4) | ((uint32_t)a[5*i+3] << 4)) & 0x3FF;
+ r->coeffs[4*i+3] = ((a[5*i+3] >> 6) | ((uint32_t)a[5*i+4] << 2)) & 0x3FF;
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt0_pack
+*
+* Description: Bit-pack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYT0_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyt0_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint32_t t[8];
+ DBENCH_START();
+
+ for(i = 0; i < N/8; ++i) {
+ t[0] = (1 << (D-1)) - a->coeffs[8*i+0];
+ t[1] = (1 << (D-1)) - a->coeffs[8*i+1];
+ t[2] = (1 << (D-1)) - a->coeffs[8*i+2];
+ t[3] = (1 << (D-1)) - a->coeffs[8*i+3];
+ t[4] = (1 << (D-1)) - a->coeffs[8*i+4];
+ t[5] = (1 << (D-1)) - a->coeffs[8*i+5];
+ t[6] = (1 << (D-1)) - a->coeffs[8*i+6];
+ t[7] = (1 << (D-1)) - a->coeffs[8*i+7];
+
+ r[13*i+ 0] = t[0];
+ r[13*i+ 1] = t[0] >> 8;
+ r[13*i+ 1] |= t[1] << 5;
+ r[13*i+ 2] = t[1] >> 3;
+ r[13*i+ 3] = t[1] >> 11;
+ r[13*i+ 3] |= t[2] << 2;
+ r[13*i+ 4] = t[2] >> 6;
+ r[13*i+ 4] |= t[3] << 7;
+ r[13*i+ 5] = t[3] >> 1;
+ r[13*i+ 6] = t[3] >> 9;
+ r[13*i+ 6] |= t[4] << 4;
+ r[13*i+ 7] = t[4] >> 4;
+ r[13*i+ 8] = t[4] >> 12;
+ r[13*i+ 8] |= t[5] << 1;
+ r[13*i+ 9] = t[5] >> 7;
+ r[13*i+ 9] |= t[6] << 6;
+ r[13*i+10] = t[6] >> 2;
+ r[13*i+11] = t[6] >> 10;
+ r[13*i+11] |= t[7] << 3;
+ r[13*i+12] = t[7] >> 5;
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyt0_unpack
+*
+* Description: Unpack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyt0_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+ for(i = 0; i < N/8; ++i) {
+ r->coeffs[8*i+0] = a[13*i+0];
+ r->coeffs[8*i+0] |= (uint32_t)a[13*i+1] << 8;
+ r->coeffs[8*i+0] &= 0x1FFF;
+
+ r->coeffs[8*i+1] = a[13*i+1] >> 5;
+ r->coeffs[8*i+1] |= (uint32_t)a[13*i+2] << 3;
+ r->coeffs[8*i+1] |= (uint32_t)a[13*i+3] << 11;
+ r->coeffs[8*i+1] &= 0x1FFF;
+
+ r->coeffs[8*i+2] = a[13*i+3] >> 2;
+ r->coeffs[8*i+2] |= (uint32_t)a[13*i+4] << 6;
+ r->coeffs[8*i+2] &= 0x1FFF;
+
+ r->coeffs[8*i+3] = a[13*i+4] >> 7;
+ r->coeffs[8*i+3] |= (uint32_t)a[13*i+5] << 1;
+ r->coeffs[8*i+3] |= (uint32_t)a[13*i+6] << 9;
+ r->coeffs[8*i+3] &= 0x1FFF;
+
+ r->coeffs[8*i+4] = a[13*i+6] >> 4;
+ r->coeffs[8*i+4] |= (uint32_t)a[13*i+7] << 4;
+ r->coeffs[8*i+4] |= (uint32_t)a[13*i+8] << 12;
+ r->coeffs[8*i+4] &= 0x1FFF;
+
+ r->coeffs[8*i+5] = a[13*i+8] >> 1;
+ r->coeffs[8*i+5] |= (uint32_t)a[13*i+9] << 7;
+ r->coeffs[8*i+5] &= 0x1FFF;
+
+ r->coeffs[8*i+6] = a[13*i+9] >> 6;
+ r->coeffs[8*i+6] |= (uint32_t)a[13*i+10] << 2;
+ r->coeffs[8*i+6] |= (uint32_t)a[13*i+11] << 10;
+ r->coeffs[8*i+6] &= 0x1FFF;
+
+ r->coeffs[8*i+7] = a[13*i+11] >> 3;
+ r->coeffs[8*i+7] |= (uint32_t)a[13*i+12] << 5;
+ r->coeffs[8*i+7] &= 0x1FFF;
+
+ r->coeffs[8*i+0] = (1 << (D-1)) - r->coeffs[8*i+0];
+ r->coeffs[8*i+1] = (1 << (D-1)) - r->coeffs[8*i+1];
+ r->coeffs[8*i+2] = (1 << (D-1)) - r->coeffs[8*i+2];
+ r->coeffs[8*i+3] = (1 << (D-1)) - r->coeffs[8*i+3];
+ r->coeffs[8*i+4] = (1 << (D-1)) - r->coeffs[8*i+4];
+ r->coeffs[8*i+5] = (1 << (D-1)) - r->coeffs[8*i+5];
+ r->coeffs[8*i+6] = (1 << (D-1)) - r->coeffs[8*i+6];
+ r->coeffs[8*i+7] = (1 << (D-1)) - r->coeffs[8*i+7];
+ }
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyz_pack
+*
+* Description: Bit-pack polynomial with coefficients
+* in [-(GAMMA1 - 1), GAMMA1].
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYZ_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyz_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ uint32_t t[4];
+ DBENCH_START();
+
+#if GAMMA1 == (1 << 17)
+ for(i = 0; i < N/4; ++i) {
+ t[0] = GAMMA1 - a->coeffs[4*i+0];
+ t[1] = GAMMA1 - a->coeffs[4*i+1];
+ t[2] = GAMMA1 - a->coeffs[4*i+2];
+ t[3] = GAMMA1 - a->coeffs[4*i+3];
+
+ r[9*i+0] = t[0];
+ r[9*i+1] = t[0] >> 8;
+ r[9*i+2] = t[0] >> 16;
+ r[9*i+2] |= t[1] << 2;
+ r[9*i+3] = t[1] >> 6;
+ r[9*i+4] = t[1] >> 14;
+ r[9*i+4] |= t[2] << 4;
+ r[9*i+5] = t[2] >> 4;
+ r[9*i+6] = t[2] >> 12;
+ r[9*i+6] |= t[3] << 6;
+ r[9*i+7] = t[3] >> 2;
+ r[9*i+8] = t[3] >> 10;
+ }
+#elif GAMMA1 == (1 << 19)
+ for(i = 0; i < N/2; ++i) {
+ t[0] = GAMMA1 - a->coeffs[2*i+0];
+ t[1] = GAMMA1 - a->coeffs[2*i+1];
+
+ r[5*i+0] = t[0];
+ r[5*i+1] = t[0] >> 8;
+ r[5*i+2] = t[0] >> 16;
+ r[5*i+2] |= t[1] << 4;
+ r[5*i+3] = t[1] >> 4;
+ r[5*i+4] = t[1] >> 12;
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyz_unpack
+*
+* Description: Unpack polynomial z with coefficients
+* in [-(GAMMA1 - 1), GAMMA1].
+*
+* Arguments: - poly *r: pointer to output polynomial
+* - const uint8_t *a: byte array with bit-packed polynomial
+**************************************************/
+void polyz_unpack(poly *r, const uint8_t *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if GAMMA1 == (1 << 17)
+ for(i = 0; i < N/4; ++i) {
+ r->coeffs[4*i+0] = a[9*i+0];
+ r->coeffs[4*i+0] |= (uint32_t)a[9*i+1] << 8;
+ r->coeffs[4*i+0] |= (uint32_t)a[9*i+2] << 16;
+ r->coeffs[4*i+0] &= 0x3FFFF;
+
+ r->coeffs[4*i+1] = a[9*i+2] >> 2;
+ r->coeffs[4*i+1] |= (uint32_t)a[9*i+3] << 6;
+ r->coeffs[4*i+1] |= (uint32_t)a[9*i+4] << 14;
+ r->coeffs[4*i+1] &= 0x3FFFF;
+
+ r->coeffs[4*i+2] = a[9*i+4] >> 4;
+ r->coeffs[4*i+2] |= (uint32_t)a[9*i+5] << 4;
+ r->coeffs[4*i+2] |= (uint32_t)a[9*i+6] << 12;
+ r->coeffs[4*i+2] &= 0x3FFFF;
+
+ r->coeffs[4*i+3] = a[9*i+6] >> 6;
+ r->coeffs[4*i+3] |= (uint32_t)a[9*i+7] << 2;
+ r->coeffs[4*i+3] |= (uint32_t)a[9*i+8] << 10;
+ r->coeffs[4*i+3] &= 0x3FFFF;
+
+ r->coeffs[4*i+0] = GAMMA1 - r->coeffs[4*i+0];
+ r->coeffs[4*i+1] = GAMMA1 - r->coeffs[4*i+1];
+ r->coeffs[4*i+2] = GAMMA1 - r->coeffs[4*i+2];
+ r->coeffs[4*i+3] = GAMMA1 - r->coeffs[4*i+3];
+ }
+#elif GAMMA1 == (1 << 19)
+ for(i = 0; i < N/2; ++i) {
+ r->coeffs[2*i+0] = a[5*i+0];
+ r->coeffs[2*i+0] |= (uint32_t)a[5*i+1] << 8;
+ r->coeffs[2*i+0] |= (uint32_t)a[5*i+2] << 16;
+ r->coeffs[2*i+0] &= 0xFFFFF;
+
+ r->coeffs[2*i+1] = a[5*i+2] >> 4;
+ r->coeffs[2*i+1] |= (uint32_t)a[5*i+3] << 4;
+ r->coeffs[2*i+1] |= (uint32_t)a[5*i+4] << 12;
+ r->coeffs[2*i+0] &= 0xFFFFF;
+
+ r->coeffs[2*i+0] = GAMMA1 - r->coeffs[2*i+0];
+ r->coeffs[2*i+1] = GAMMA1 - r->coeffs[2*i+1];
+ }
+#endif
+
+ DBENCH_STOP(*tpack);
+}
+
+/*************************************************
+* Name: polyw1_pack
+*
+* Description: Bit-pack polynomial w1 with coefficients in [0,15] or [0,43].
+* Input coefficients are assumed to be standard representatives.
+*
+* Arguments: - uint8_t *r: pointer to output byte array with at least
+* POLYW1_PACKEDBYTES bytes
+* - const poly *a: pointer to input polynomial
+**************************************************/
+void polyw1_pack(uint8_t *r, const poly *a) {
+ unsigned int i;
+ DBENCH_START();
+
+#if GAMMA2 == (Q-1)/88
+ for(i = 0; i < N/4; ++i) {
+ r[3*i+0] = a->coeffs[4*i+0];
+ r[3*i+0] |= a->coeffs[4*i+1] << 6;
+ r[3*i+1] = a->coeffs[4*i+1] >> 2;
+ r[3*i+1] |= a->coeffs[4*i+2] << 4;
+ r[3*i+2] = a->coeffs[4*i+2] >> 4;
+ r[3*i+2] |= a->coeffs[4*i+3] << 2;
+ }
+#elif GAMMA2 == (Q-1)/32
+ for(i = 0; i < N/2; ++i)
+ r[i] = a->coeffs[2*i+0] | (a->coeffs[2*i+1] << 4);
+#endif
+
+ DBENCH_STOP(*tpack);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.h
new file mode 100644
index 000000000..d2fd989b6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/poly.h
@@ -0,0 +1,79 @@
+#ifndef POLY_H
+#define POLY_H
+
+#include <stdint.h>
+#include "params.h"
+
+typedef struct {
+ int32_t coeffs[N];
+} poly;
+
+#define poly_reduce DILITHIUM_NAMESPACE(poly_reduce)
+void poly_reduce(poly *a);
+#define poly_caddq DILITHIUM_NAMESPACE(poly_caddq)
+void poly_caddq(poly *a);
+
+#define poly_add DILITHIUM_NAMESPACE(poly_add)
+void poly_add(poly *c, const poly *a, const poly *b);
+#define poly_sub DILITHIUM_NAMESPACE(poly_sub)
+void poly_sub(poly *c, const poly *a, const poly *b);
+#define poly_shiftl DILITHIUM_NAMESPACE(poly_shiftl)
+void poly_shiftl(poly *a);
+
+#define poly_ntt DILITHIUM_NAMESPACE(poly_ntt)
+void poly_ntt(poly *a);
+#define poly_invntt_tomont DILITHIUM_NAMESPACE(poly_invntt_tomont)
+void poly_invntt_tomont(poly *a);
+#define poly_pointwise_montgomery DILITHIUM_NAMESPACE(poly_pointwise_montgomery)
+void poly_pointwise_montgomery(poly *c, const poly *a, const poly *b);
+
+#define poly_power2round DILITHIUM_NAMESPACE(poly_power2round)
+void poly_power2round(poly *a1, poly *a0, const poly *a);
+#define poly_decompose DILITHIUM_NAMESPACE(poly_decompose)
+void poly_decompose(poly *a1, poly *a0, const poly *a);
+#define poly_make_hint DILITHIUM_NAMESPACE(poly_make_hint)
+unsigned int poly_make_hint(poly *h, const poly *a0, const poly *a1);
+#define poly_use_hint DILITHIUM_NAMESPACE(poly_use_hint)
+void poly_use_hint(poly *b, const poly *a, const poly *h);
+
+#define poly_chknorm DILITHIUM_NAMESPACE(poly_chknorm)
+int poly_chknorm(const poly *a, int32_t B);
+#define poly_uniform DILITHIUM_NAMESPACE(poly_uniform)
+void poly_uniform(poly *a,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce);
+#define poly_uniform_eta DILITHIUM_NAMESPACE(poly_uniform_eta)
+void poly_uniform_eta(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+#define poly_uniform_gamma1 DILITHIUM_NAMESPACE(poly_uniform_gamma1)
+void poly_uniform_gamma1(poly *a,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+#define poly_challenge DILITHIUM_NAMESPACE(poly_challenge)
+void poly_challenge(poly *c, const uint8_t seed[SEEDBYTES]);
+
+#define polyeta_pack DILITHIUM_NAMESPACE(polyeta_pack)
+void polyeta_pack(uint8_t *r, const poly *a);
+#define polyeta_unpack DILITHIUM_NAMESPACE(polyeta_unpack)
+void polyeta_unpack(poly *r, const uint8_t *a);
+
+#define polyt1_pack DILITHIUM_NAMESPACE(polyt1_pack)
+void polyt1_pack(uint8_t *r, const poly *a);
+#define polyt1_unpack DILITHIUM_NAMESPACE(polyt1_unpack)
+void polyt1_unpack(poly *r, const uint8_t *a);
+
+#define polyt0_pack DILITHIUM_NAMESPACE(polyt0_pack)
+void polyt0_pack(uint8_t *r, const poly *a);
+#define polyt0_unpack DILITHIUM_NAMESPACE(polyt0_unpack)
+void polyt0_unpack(poly *r, const uint8_t *a);
+
+#define polyz_pack DILITHIUM_NAMESPACE(polyz_pack)
+void polyz_pack(uint8_t *r, const poly *a);
+#define polyz_unpack DILITHIUM_NAMESPACE(polyz_unpack)
+void polyz_unpack(poly *r, const uint8_t *a);
+
+#define polyw1_pack DILITHIUM_NAMESPACE(polyw1_pack)
+void polyw1_pack(uint8_t *r, const poly *a);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.c
new file mode 100644
index 000000000..c4e9037ab
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.c
@@ -0,0 +1,390 @@
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+#include "poly.h"
+
+/*************************************************
+* Name: expand_mat
+*
+* Description: Implementation of ExpandA. Generates matrix A with uniformly
+* random coefficients a_{i,j} by performing rejection
+* sampling on the output stream of SHAKE128(rho|j|i)
+* or AES256CTR(rho,j|i).
+*
+* Arguments: - polyvecl mat[K]: output matrix
+* - const uint8_t rho[]: byte array containing seed rho
+**************************************************/
+void polyvec_matrix_expand(polyvecl mat[K], const uint8_t rho[SEEDBYTES]) {
+ unsigned int i, j;
+
+ for(i = 0; i < K; ++i)
+ for(j = 0; j < L; ++j)
+ poly_uniform(&mat[i].vec[j], rho, (i << 8) + j);
+}
+
+void polyvec_matrix_pointwise_montgomery(polyveck *t, const polyvecl mat[K], const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ polyvecl_pointwise_acc_montgomery(&t->vec[i], &mat[i], v);
+}
+
+/**************************************************************/
+/************ Vectors of polynomials of length L **************/
+/**************************************************************/
+
+void polyvecl_uniform_eta(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_uniform_eta(&v->vec[i], seed, nonce++);
+}
+
+void polyvecl_uniform_gamma1(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_uniform_gamma1(&v->vec[i], seed, L*nonce + i);
+}
+
+void polyvecl_reduce(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_reduce(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_add
+*
+* Description: Add vectors of polynomials of length L.
+* No modular reduction is performed.
+*
+* Arguments: - polyvecl *w: pointer to output vector
+* - const polyvecl *u: pointer to first summand
+* - const polyvecl *v: pointer to second summand
+**************************************************/
+void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_ntt
+*
+* Description: Forward NTT of all polynomials in vector of length L. Output
+* coefficients can be up to 16*Q larger than input coefficients.
+*
+* Arguments: - polyvecl *v: pointer to input/output vector
+**************************************************/
+void polyvecl_ntt(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_ntt(&v->vec[i]);
+}
+
+void polyvecl_invntt_tomont(polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_invntt_tomont(&v->vec[i]);
+}
+
+void polyvecl_pointwise_poly_montgomery(polyvecl *r, const poly *a, const polyvecl *v) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ poly_pointwise_montgomery(&r->vec[i], a, &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyvecl_pointwise_acc_montgomery
+*
+* Description: Pointwise multiply vectors of polynomials of length L, multiply
+* resulting vector by 2^{-32} and add (accumulate) polynomials
+* in it. Input/output vectors are in NTT domain representation.
+*
+* Arguments: - poly *w: output polynomial
+* - const polyvecl *u: pointer to first input vector
+* - const polyvecl *v: pointer to second input vector
+**************************************************/
+void polyvecl_pointwise_acc_montgomery(poly *w,
+ const polyvecl *u,
+ const polyvecl *v)
+{
+ unsigned int i;
+ poly t;
+
+ poly_pointwise_montgomery(w, &u->vec[0], &v->vec[0]);
+ for(i = 1; i < L; ++i) {
+ poly_pointwise_montgomery(&t, &u->vec[i], &v->vec[i]);
+ poly_add(w, w, &t);
+ }
+}
+
+/*************************************************
+* Name: polyvecl_chknorm
+*
+* Description: Check infinity norm of polynomials in vector of length L.
+* Assumes input polyvecl to be reduced by polyvecl_reduce().
+*
+* Arguments: - const polyvecl *v: pointer to vector
+* - int32_t B: norm bound
+*
+* Returns 0 if norm of all polynomials is strictly smaller than B <= (Q-1)/8
+* and 1 otherwise.
+**************************************************/
+int polyvecl_chknorm(const polyvecl *v, int32_t bound) {
+ unsigned int i;
+
+ for(i = 0; i < L; ++i)
+ if(poly_chknorm(&v->vec[i], bound))
+ return 1;
+
+ return 0;
+}
+
+/**************************************************************/
+/************ Vectors of polynomials of length K **************/
+/**************************************************************/
+
+void polyveck_uniform_eta(polyveck *v, const uint8_t seed[CRHBYTES], uint16_t nonce) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_uniform_eta(&v->vec[i], seed, nonce++);
+}
+
+/*************************************************
+* Name: polyveck_reduce
+*
+* Description: Reduce coefficients of polynomials in vector of length K
+* to representatives in [-6283009,6283007].
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_reduce(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_reduce(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_caddq
+*
+* Description: For all coefficients of polynomials in vector of length K
+* add Q if coefficient is negative.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_caddq(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_caddq(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_add
+*
+* Description: Add vectors of polynomials of length K.
+* No modular reduction is performed.
+*
+* Arguments: - polyveck *w: pointer to output vector
+* - const polyveck *u: pointer to first summand
+* - const polyveck *v: pointer to second summand
+**************************************************/
+void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_sub
+*
+* Description: Subtract vectors of polynomials of length K.
+* No modular reduction is performed.
+*
+* Arguments: - polyveck *w: pointer to output vector
+* - const polyveck *u: pointer to first input vector
+* - const polyveck *v: pointer to second input vector to be
+* subtracted from first input vector
+**************************************************/
+void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_sub(&w->vec[i], &u->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_shiftl
+*
+* Description: Multiply vector of polynomials of Length K by 2^D without modular
+* reduction. Assumes input coefficients to be less than 2^{31-D}.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_shiftl(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_shiftl(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_ntt
+*
+* Description: Forward NTT of all polynomials in vector of length K. Output
+* coefficients can be up to 16*Q larger than input coefficients.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_ntt(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_ntt(&v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_invntt_tomont
+*
+* Description: Inverse NTT and multiplication by 2^{32} of polynomials
+* in vector of length K. Input coefficients need to be less
+* than 2*Q.
+*
+* Arguments: - polyveck *v: pointer to input/output vector
+**************************************************/
+void polyveck_invntt_tomont(polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_invntt_tomont(&v->vec[i]);
+}
+
+void polyveck_pointwise_poly_montgomery(polyveck *r, const poly *a, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_pointwise_montgomery(&r->vec[i], a, &v->vec[i]);
+}
+
+
+/*************************************************
+* Name: polyveck_chknorm
+*
+* Description: Check infinity norm of polynomials in vector of length K.
+* Assumes input polyveck to be reduced by polyveck_reduce().
+*
+* Arguments: - const polyveck *v: pointer to vector
+* - int32_t B: norm bound
+*
+* Returns 0 if norm of all polynomials are strictly smaller than B <= (Q-1)/8
+* and 1 otherwise.
+**************************************************/
+int polyveck_chknorm(const polyveck *v, int32_t bound) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ if(poly_chknorm(&v->vec[i], bound))
+ return 1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: polyveck_power2round
+*
+* Description: For all coefficients a of polynomials in vector of length K,
+* compute a0, a1 such that a mod^+ Q = a1*2^D + a0
+* with -2^{D-1} < a0 <= 2^{D-1}. Assumes coefficients to be
+* standard representatives.
+*
+* Arguments: - polyveck *v1: pointer to output vector of polynomials with
+* coefficients a1
+* - polyveck *v0: pointer to output vector of polynomials with
+* coefficients a0
+* - const polyveck *v: pointer to input vector
+**************************************************/
+void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_power2round(&v1->vec[i], &v0->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_decompose
+*
+* Description: For all coefficients a of polynomials in vector of length K,
+* compute high and low bits a0, a1 such a mod^+ Q = a1*ALPHA + a0
+* with -ALPHA/2 < a0 <= ALPHA/2 except a1 = (Q-1)/ALPHA where we
+* set a1 = 0 and -ALPHA/2 <= a0 = a mod Q - Q < 0.
+* Assumes coefficients to be standard representatives.
+*
+* Arguments: - polyveck *v1: pointer to output vector of polynomials with
+* coefficients a1
+* - polyveck *v0: pointer to output vector of polynomials with
+* coefficients a0
+* - const polyveck *v: pointer to input vector
+**************************************************/
+void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_decompose(&v1->vec[i], &v0->vec[i], &v->vec[i]);
+}
+
+/*************************************************
+* Name: polyveck_make_hint
+*
+* Description: Compute hint vector.
+*
+* Arguments: - polyveck *h: pointer to output vector
+* - const polyveck *v0: pointer to low part of input vector
+* - const polyveck *v1: pointer to high part of input vector
+*
+* Returns number of 1 bits.
+**************************************************/
+unsigned int polyveck_make_hint(polyveck *h,
+ const polyveck *v0,
+ const polyveck *v1)
+{
+ unsigned int i, s = 0;
+
+ for(i = 0; i < K; ++i)
+ s += poly_make_hint(&h->vec[i], &v0->vec[i], &v1->vec[i]);
+
+ return s;
+}
+
+/*************************************************
+* Name: polyveck_use_hint
+*
+* Description: Use hint vector to correct the high bits of input vector.
+*
+* Arguments: - polyveck *w: pointer to output vector of polynomials with
+* corrected high bits
+* - const polyveck *u: pointer to input vector
+* - const polyveck *h: pointer to input hint vector
+**************************************************/
+void polyveck_use_hint(polyveck *w, const polyveck *u, const polyveck *h) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ poly_use_hint(&w->vec[i], &u->vec[i], &h->vec[i]);
+}
+
+void polyveck_pack_w1(uint8_t r[K*POLYW1_PACKEDBYTES], const polyveck *w1) {
+ unsigned int i;
+
+ for(i = 0; i < K; ++i)
+ polyw1_pack(&r[i*POLYW1_PACKEDBYTES], &w1->vec[i]);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.h
new file mode 100644
index 000000000..615ac5299
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/polyvec.h
@@ -0,0 +1,93 @@
+#ifndef POLYVEC_H
+#define POLYVEC_H
+
+#include <stdint.h>
+#include "params.h"
+#include "poly.h"
+
+/* Vectors of polynomials of length L */
+typedef struct {
+ poly vec[L];
+} polyvecl;
+
+#define polyvecl_uniform_eta DILITHIUM_NAMESPACE(polyvecl_uniform_eta)
+void polyvecl_uniform_eta(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyvecl_uniform_gamma1 DILITHIUM_NAMESPACE(polyvecl_uniform_gamma1)
+void polyvecl_uniform_gamma1(polyvecl *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyvecl_reduce DILITHIUM_NAMESPACE(polyvecl_reduce)
+void polyvecl_reduce(polyvecl *v);
+
+#define polyvecl_add DILITHIUM_NAMESPACE(polyvecl_add)
+void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v);
+
+#define polyvecl_ntt DILITHIUM_NAMESPACE(polyvecl_ntt)
+void polyvecl_ntt(polyvecl *v);
+#define polyvecl_invntt_tomont DILITHIUM_NAMESPACE(polyvecl_invntt_tomont)
+void polyvecl_invntt_tomont(polyvecl *v);
+#define polyvecl_pointwise_poly_montgomery DILITHIUM_NAMESPACE(polyvecl_pointwise_poly_montgomery)
+void polyvecl_pointwise_poly_montgomery(polyvecl *r, const poly *a, const polyvecl *v);
+#define polyvecl_pointwise_acc_montgomery \
+ DILITHIUM_NAMESPACE(polyvecl_pointwise_acc_montgomery)
+void polyvecl_pointwise_acc_montgomery(poly *w,
+ const polyvecl *u,
+ const polyvecl *v);
+
+
+#define polyvecl_chknorm DILITHIUM_NAMESPACE(polyvecl_chknorm)
+int polyvecl_chknorm(const polyvecl *v, int32_t B);
+
+
+
+/* Vectors of polynomials of length K */
+typedef struct {
+ poly vec[K];
+} polyveck;
+
+#define polyveck_uniform_eta DILITHIUM_NAMESPACE(polyveck_uniform_eta)
+void polyveck_uniform_eta(polyveck *v, const uint8_t seed[CRHBYTES], uint16_t nonce);
+
+#define polyveck_reduce DILITHIUM_NAMESPACE(polyveck_reduce)
+void polyveck_reduce(polyveck *v);
+#define polyveck_caddq DILITHIUM_NAMESPACE(polyveck_caddq)
+void polyveck_caddq(polyveck *v);
+
+#define polyveck_add DILITHIUM_NAMESPACE(polyveck_add)
+void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v);
+#define polyveck_sub DILITHIUM_NAMESPACE(polyveck_sub)
+void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v);
+#define polyveck_shiftl DILITHIUM_NAMESPACE(polyveck_shiftl)
+void polyveck_shiftl(polyveck *v);
+
+#define polyveck_ntt DILITHIUM_NAMESPACE(polyveck_ntt)
+void polyveck_ntt(polyveck *v);
+#define polyveck_invntt_tomont DILITHIUM_NAMESPACE(polyveck_invntt_tomont)
+void polyveck_invntt_tomont(polyveck *v);
+#define polyveck_pointwise_poly_montgomery DILITHIUM_NAMESPACE(polyveck_pointwise_poly_montgomery)
+void polyveck_pointwise_poly_montgomery(polyveck *r, const poly *a, const polyveck *v);
+
+#define polyveck_chknorm DILITHIUM_NAMESPACE(polyveck_chknorm)
+int polyveck_chknorm(const polyveck *v, int32_t B);
+
+#define polyveck_power2round DILITHIUM_NAMESPACE(polyveck_power2round)
+void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v);
+#define polyveck_decompose DILITHIUM_NAMESPACE(polyveck_decompose)
+void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v);
+#define polyveck_make_hint DILITHIUM_NAMESPACE(polyveck_make_hint)
+unsigned int polyveck_make_hint(polyveck *h,
+ const polyveck *v0,
+ const polyveck *v1);
+#define polyveck_use_hint DILITHIUM_NAMESPACE(polyveck_use_hint)
+void polyveck_use_hint(polyveck *w, const polyveck *v, const polyveck *h);
+
+#define polyveck_pack_w1 DILITHIUM_NAMESPACE(polyveck_pack_w1)
+void polyveck_pack_w1(uint8_t r[K*POLYW1_PACKEDBYTES], const polyveck *w1);
+
+#define polyvec_matrix_expand DILITHIUM_NAMESPACE(polyvec_matrix_expand)
+void polyvec_matrix_expand(polyvecl mat[K], const uint8_t rho[SEEDBYTES]);
+
+#define polyvec_matrix_pointwise_montgomery DILITHIUM_NAMESPACE(polyvec_matrix_pointwise_montgomery)
+void polyvec_matrix_pointwise_montgomery(polyveck *t, const polyvecl mat[K], const polyvecl *v);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/pqcrystals-dilithium_dilithium5_ref.gyp b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/pqcrystals-dilithium_dilithium5_ref.gyp
new file mode 100644
index 000000000..5aa255026
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/pqcrystals-dilithium_dilithium5_ref.gyp
@@ -0,0 +1,41 @@
+# DO NOT EDIT: generated from subdir.gyp.template
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+{
+ 'includes': [
+ '../../../../../../coreconf/config.gypi'
+ ],
+ 'targets': [
+ {
+ 'target_name': 'oqs_src_sig_dilithium_pqcrystals-dilithium_dilithium5_ref',
+ 'type': 'static_library',
+ 'sources': [
+ 'ntt.c',
+ 'packing.c',
+ 'poly.c',
+ 'polyvec.c',
+ 'reduce.c',
+ 'rounding.c',
+ 'sign.c',
+ 'symmetric-shake.c',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/exports.gyp:nss_exports'
+ ]
+ }
+ ],
+ 'target_defaults': {
+ 'defines': [
+ 'DILITHIUM_MODE=5',
+ 'DILITHIUM_RANDOMIZED_SIGNING',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/lib/liboqs/src/common/pqclean_shims',
+ '<(DEPTH)/lib/liboqs/src/common/sha3/xkcp_low/KeccakP-1600/plain-64bits',
+ ]
+ },
+ 'variables': {
+ 'module': 'oqs'
+ }
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.c
new file mode 100644
index 000000000..75feff8bc
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.c
@@ -0,0 +1,69 @@
+#include <stdint.h>
+#include "params.h"
+#include "reduce.h"
+
+/*************************************************
+* Name: montgomery_reduce
+*
+* Description: For finite field element a with -2^{31}Q <= a <= Q*2^31,
+* compute r \equiv a*2^{-32} (mod Q) such that -Q < r < Q.
+*
+* Arguments: - int64_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t montgomery_reduce(int64_t a) {
+ int32_t t;
+
+ t = (int64_t)(int32_t)a*QINV;
+ t = (a - (int64_t)t*Q) >> 32;
+ return t;
+}
+
+/*************************************************
+* Name: reduce32
+*
+* Description: For finite field element a with a <= 2^{31} - 2^{22} - 1,
+* compute r \equiv a (mod Q) such that -6283009 <= r <= 6283007.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t reduce32(int32_t a) {
+ int32_t t;
+
+ t = (a + (1 << 22)) >> 23;
+ t = a - t*Q;
+ return t;
+}
+
+/*************************************************
+* Name: caddq
+*
+* Description: Add Q if input coefficient is negative.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t caddq(int32_t a) {
+ a += (a >> 31) & Q;
+ return a;
+}
+
+/*************************************************
+* Name: freeze
+*
+* Description: For finite field element a, compute standard
+* representative r = a mod^+ Q.
+*
+* Arguments: - int32_t: finite field element a
+*
+* Returns r.
+**************************************************/
+int32_t freeze(int32_t a) {
+ a = reduce32(a);
+ a = caddq(a);
+ return a;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.h
new file mode 100644
index 000000000..26d9b4ee2
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/reduce.h
@@ -0,0 +1,22 @@
+#ifndef REDUCE_H
+#define REDUCE_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define MONT -4186625 // 2^32 % Q
+#define QINV 58728449 // q^(-1) mod 2^32
+
+#define montgomery_reduce DILITHIUM_NAMESPACE(montgomery_reduce)
+int32_t montgomery_reduce(int64_t a);
+
+#define reduce32 DILITHIUM_NAMESPACE(reduce32)
+int32_t reduce32(int32_t a);
+
+#define caddq DILITHIUM_NAMESPACE(caddq)
+int32_t caddq(int32_t a);
+
+#define freeze DILITHIUM_NAMESPACE(freeze)
+int32_t freeze(int32_t a);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.c
new file mode 100644
index 000000000..889f0a296
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.c
@@ -0,0 +1,102 @@
+#include <stdint.h>
+#include "params.h"
+#include "rounding.h"
+
+/*************************************************
+* Name: power2round
+*
+* Description: For finite field element a, compute a0, a1 such that
+* a mod^+ Q = a1*2^D + a0 with -2^{D-1} < a0 <= 2^{D-1}.
+* Assumes a to be standard representative.
+*
+* Arguments: - int32_t a: input element
+* - int32_t *a0: pointer to output element a0
+*
+* Returns a1.
+**************************************************/
+int32_t power2round(int32_t *a0, int32_t a) {
+ int32_t a1;
+
+ a1 = (a + (1 << (D-1)) - 1) >> D;
+ *a0 = a - (a1 << D);
+ return a1;
+}
+
+/*************************************************
+* Name: decompose
+*
+* Description: For finite field element a, compute high and low bits a0, a1 such
+* that a mod^+ Q = a1*ALPHA + a0 with -ALPHA/2 < a0 <= ALPHA/2 except
+* if a1 = (Q-1)/ALPHA where we set a1 = 0 and
+* -ALPHA/2 <= a0 = a mod^+ Q - Q < 0. Assumes a to be standard
+* representative.
+*
+* Arguments: - int32_t a: input element
+* - int32_t *a0: pointer to output element a0
+*
+* Returns a1.
+**************************************************/
+int32_t decompose(int32_t *a0, int32_t a) {
+ int32_t a1;
+
+ a1 = (a + 127) >> 7;
+#if GAMMA2 == (Q-1)/32
+ a1 = (a1*1025 + (1 << 21)) >> 22;
+ a1 &= 15;
+#elif GAMMA2 == (Q-1)/88
+ a1 = (a1*11275 + (1 << 23)) >> 24;
+ a1 ^= ((43 - a1) >> 31) & a1;
+#endif
+
+ *a0 = a - a1*2*GAMMA2;
+ *a0 -= (((Q-1)/2 - *a0) >> 31) & Q;
+ return a1;
+}
+
+/*************************************************
+* Name: make_hint
+*
+* Description: Compute hint bit indicating whether the low bits of the
+* input element overflow into the high bits.
+*
+* Arguments: - int32_t a0: low bits of input element
+* - int32_t a1: high bits of input element
+*
+* Returns 1 if overflow.
+**************************************************/
+unsigned int make_hint(int32_t a0, int32_t a1) {
+ if(a0 > GAMMA2 || a0 < -GAMMA2 || (a0 == -GAMMA2 && a1 != 0))
+ return 1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: use_hint
+*
+* Description: Correct high bits according to hint.
+*
+* Arguments: - int32_t a: input element
+* - unsigned int hint: hint bit
+*
+* Returns corrected high bits.
+**************************************************/
+int32_t use_hint(int32_t a, unsigned int hint) {
+ int32_t a0, a1;
+
+ a1 = decompose(&a0, a);
+ if(hint == 0)
+ return a1;
+
+#if GAMMA2 == (Q-1)/32
+ if(a0 > 0)
+ return (a1 + 1) & 15;
+ else
+ return (a1 - 1) & 15;
+#elif GAMMA2 == (Q-1)/88
+ if(a0 > 0)
+ return (a1 == 43) ? 0 : a1 + 1;
+ else
+ return (a1 == 0) ? 43 : a1 - 1;
+#endif
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.h
new file mode 100644
index 000000000..b72e8e8d6
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/rounding.h
@@ -0,0 +1,19 @@
+#ifndef ROUNDING_H
+#define ROUNDING_H
+
+#include <stdint.h>
+#include "params.h"
+
+#define power2round DILITHIUM_NAMESPACE(power2round)
+int32_t power2round(int32_t *a0, int32_t a);
+
+#define decompose DILITHIUM_NAMESPACE(decompose)
+int32_t decompose(int32_t *a0, int32_t a);
+
+#define make_hint DILITHIUM_NAMESPACE(make_hint)
+unsigned int make_hint(int32_t a0, int32_t a1);
+
+#define use_hint DILITHIUM_NAMESPACE(use_hint)
+int32_t use_hint(int32_t a, unsigned int hint);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.c
new file mode 100644
index 000000000..16333eb84
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.c
@@ -0,0 +1,337 @@
+#include <stdint.h>
+#include "params.h"
+#include "sign.h"
+#include "packing.h"
+#include "polyvec.h"
+#include "poly.h"
+#include "randombytes.h"
+#include "symmetric.h"
+#include "fips202.h"
+
+/*************************************************
+* Name: crypto_sign_keypair
+*
+* Description: Generates public and private key.
+*
+* Arguments: - uint8_t *pk: pointer to output public key (allocated
+* array of CRYPTO_PUBLICKEYBYTES bytes)
+* - uint8_t *sk: pointer to output private key (allocated
+* array of CRYPTO_SECRETKEYBYTES bytes)
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign_keypair(uint8_t *pk, uint8_t *sk) {
+ uint8_t seedbuf[2*SEEDBYTES + CRHBYTES];
+ uint8_t tr[SEEDBYTES];
+ const uint8_t *rho, *rhoprime, *key;
+ polyvecl mat[K];
+ polyvecl s1, s1hat;
+ polyveck s2, t1, t0;
+
+ /* Get randomness for rho, rhoprime and key */
+ randombytes(seedbuf, SEEDBYTES);
+ shake256(seedbuf, 2*SEEDBYTES + CRHBYTES, seedbuf, SEEDBYTES);
+ rho = seedbuf;
+ rhoprime = rho + SEEDBYTES;
+ key = rhoprime + CRHBYTES;
+
+ /* Expand matrix */
+ polyvec_matrix_expand(mat, rho);
+
+ /* Sample short vectors s1 and s2 */
+ polyvecl_uniform_eta(&s1, rhoprime, 0);
+ polyveck_uniform_eta(&s2, rhoprime, L);
+
+ /* Matrix-vector multiplication */
+ s1hat = s1;
+ polyvecl_ntt(&s1hat);
+ polyvec_matrix_pointwise_montgomery(&t1, mat, &s1hat);
+ polyveck_reduce(&t1);
+ polyveck_invntt_tomont(&t1);
+
+ /* Add error vector s2 */
+ polyveck_add(&t1, &t1, &s2);
+
+ /* Extract t1 and write public key */
+ polyveck_caddq(&t1);
+ polyveck_power2round(&t1, &t0, &t1);
+ pack_pk(pk, rho, &t1);
+
+ /* Compute H(rho, t1) and write secret key */
+ shake256(tr, SEEDBYTES, pk, CRYPTO_PUBLICKEYBYTES);
+ pack_sk(sk, rho, tr, key, &t0, &s1, &s2);
+
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_signature
+*
+* Description: Computes signature.
+*
+* Arguments: - uint8_t *sig: pointer to output signature (of length CRYPTO_BYTES)
+* - size_t *siglen: pointer to output length of signature
+* - uint8_t *m: pointer to message to be signed
+* - size_t mlen: length of message
+* - uint8_t *sk: pointer to bit-packed secret key
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign_signature(uint8_t *sig,
+ size_t *siglen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *sk)
+{
+ unsigned int n;
+ uint8_t seedbuf[3*SEEDBYTES + 2*CRHBYTES];
+ uint8_t *rho, *tr, *key, *mu, *rhoprime;
+ uint16_t nonce = 0;
+ polyvecl mat[K], s1, y, z;
+ polyveck t0, s2, w1, w0, h;
+ poly cp;
+ shake256incctx state;
+
+ rho = seedbuf;
+ tr = rho + SEEDBYTES;
+ key = tr + SEEDBYTES;
+ mu = key + SEEDBYTES;
+ rhoprime = mu + CRHBYTES;
+ unpack_sk(rho, tr, key, &t0, &s1, &s2, sk);
+
+ /* Compute CRH(tr, msg) */
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, tr, SEEDBYTES);
+ shake256_inc_absorb(&state, m, mlen);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(mu, CRHBYTES, &state);
+
+#ifdef DILITHIUM_RANDOMIZED_SIGNING
+ randombytes(rhoprime, CRHBYTES);
+#else
+ shake256(rhoprime, CRHBYTES, key, SEEDBYTES + CRHBYTES);
+#endif
+
+ /* Expand matrix and transform vectors */
+ polyvec_matrix_expand(mat, rho);
+ polyvecl_ntt(&s1);
+ polyveck_ntt(&s2);
+ polyveck_ntt(&t0);
+
+rej:
+ /* Sample intermediate vector y */
+ polyvecl_uniform_gamma1(&y, rhoprime, nonce++);
+
+ /* Matrix-vector multiplication */
+ z = y;
+ polyvecl_ntt(&z);
+ polyvec_matrix_pointwise_montgomery(&w1, mat, &z);
+ polyveck_reduce(&w1);
+ polyveck_invntt_tomont(&w1);
+
+ /* Decompose w and call the random oracle */
+ polyveck_caddq(&w1);
+ polyveck_decompose(&w1, &w0, &w1);
+ polyveck_pack_w1(sig, &w1);
+
+ shake256_inc_ctx_reset(&state);
+ shake256_inc_absorb(&state, mu, CRHBYTES);
+ shake256_inc_absorb(&state, sig, K*POLYW1_PACKEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(sig, SEEDBYTES, &state);
+ poly_challenge(&cp, sig);
+ poly_ntt(&cp);
+
+ /* Compute z, reject if it reveals secret */
+ polyvecl_pointwise_poly_montgomery(&z, &cp, &s1);
+ polyvecl_invntt_tomont(&z);
+ polyvecl_add(&z, &z, &y);
+ polyvecl_reduce(&z);
+ if(polyvecl_chknorm(&z, GAMMA1 - BETA))
+ goto rej;
+
+ /* Check that subtracting cs2 does not change high bits of w and low bits
+ * do not reveal secret information */
+ polyveck_pointwise_poly_montgomery(&h, &cp, &s2);
+ polyveck_invntt_tomont(&h);
+ polyveck_sub(&w0, &w0, &h);
+ polyveck_reduce(&w0);
+ if(polyveck_chknorm(&w0, GAMMA2 - BETA))
+ goto rej;
+
+ /* Compute hints for w1 */
+ polyveck_pointwise_poly_montgomery(&h, &cp, &t0);
+ polyveck_invntt_tomont(&h);
+ polyveck_reduce(&h);
+ if(polyveck_chknorm(&h, GAMMA2))
+ goto rej;
+
+ polyveck_add(&w0, &w0, &h);
+ n = polyveck_make_hint(&h, &w0, &w1);
+ if(n > OMEGA)
+ goto rej;
+
+ shake256_inc_ctx_release(&state);
+
+ /* Write signature */
+ pack_sig(sig, sig, &z, &h);
+ *siglen = CRYPTO_BYTES;
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign
+*
+* Description: Compute signed message.
+*
+* Arguments: - uint8_t *sm: pointer to output signed message (allocated
+* array with CRYPTO_BYTES + mlen bytes),
+* can be equal to m
+* - size_t *smlen: pointer to output length of signed
+* message
+* - const uint8_t *m: pointer to message to be signed
+* - size_t mlen: length of message
+* - const uint8_t *sk: pointer to bit-packed secret key
+*
+* Returns 0 (success)
+**************************************************/
+int crypto_sign(uint8_t *sm,
+ size_t *smlen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *sk)
+{
+ size_t i;
+
+ for(i = 0; i < mlen; ++i)
+ sm[CRYPTO_BYTES + mlen - 1 - i] = m[mlen - 1 - i];
+ crypto_sign_signature(sm, smlen, sm + CRYPTO_BYTES, mlen, sk);
+ *smlen += mlen;
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_verify
+*
+* Description: Verifies signature.
+*
+* Arguments: - uint8_t *m: pointer to input signature
+* - size_t siglen: length of signature
+* - const uint8_t *m: pointer to message
+* - size_t mlen: length of message
+* - const uint8_t *pk: pointer to bit-packed public key
+*
+* Returns 0 if signature could be verified correctly and -1 otherwise
+**************************************************/
+int crypto_sign_verify(const uint8_t *sig,
+ size_t siglen,
+ const uint8_t *m,
+ size_t mlen,
+ const uint8_t *pk)
+{
+ unsigned int i;
+ uint8_t buf[K*POLYW1_PACKEDBYTES];
+ uint8_t rho[SEEDBYTES];
+ uint8_t mu[CRHBYTES];
+ uint8_t c[SEEDBYTES];
+ uint8_t c2[SEEDBYTES];
+ poly cp;
+ polyvecl mat[K], z;
+ polyveck t1, w1, h;
+ shake256incctx state;
+
+ if(siglen != CRYPTO_BYTES)
+ return -1;
+
+ unpack_pk(rho, &t1, pk);
+ if(unpack_sig(c, &z, &h, sig))
+ return -1;
+ if(polyvecl_chknorm(&z, GAMMA1 - BETA))
+ return -1;
+
+ /* Compute CRH(H(rho, t1), msg) */
+ shake256(mu, SEEDBYTES, pk, CRYPTO_PUBLICKEYBYTES);
+ shake256_inc_init(&state);
+ shake256_inc_absorb(&state, mu, SEEDBYTES);
+ shake256_inc_absorb(&state, m, mlen);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(mu, CRHBYTES, &state);
+
+ /* Matrix-vector multiplication; compute Az - c2^dt1 */
+ poly_challenge(&cp, c);
+ polyvec_matrix_expand(mat, rho);
+
+ polyvecl_ntt(&z);
+ polyvec_matrix_pointwise_montgomery(&w1, mat, &z);
+
+ poly_ntt(&cp);
+ polyveck_shiftl(&t1);
+ polyveck_ntt(&t1);
+ polyveck_pointwise_poly_montgomery(&t1, &cp, &t1);
+
+ polyveck_sub(&w1, &w1, &t1);
+ polyveck_reduce(&w1);
+ polyveck_invntt_tomont(&w1);
+
+ /* Reconstruct w1 */
+ polyveck_caddq(&w1);
+ polyveck_use_hint(&w1, &w1, &h);
+ polyveck_pack_w1(buf, &w1);
+
+ /* Call random oracle and verify challenge */
+ shake256_inc_ctx_reset(&state);
+ shake256_inc_absorb(&state, mu, CRHBYTES);
+ shake256_inc_absorb(&state, buf, K*POLYW1_PACKEDBYTES);
+ shake256_inc_finalize(&state);
+ shake256_inc_squeeze(c2, SEEDBYTES, &state);
+ shake256_inc_ctx_release(&state);
+ for(i = 0; i < SEEDBYTES; ++i)
+ if(c[i] != c2[i])
+ return -1;
+
+ return 0;
+}
+
+/*************************************************
+* Name: crypto_sign_open
+*
+* Description: Verify signed message.
+*
+* Arguments: - uint8_t *m: pointer to output message (allocated
+* array with smlen bytes), can be equal to sm
+* - size_t *mlen: pointer to output length of message
+* - const uint8_t *sm: pointer to signed message
+* - size_t smlen: length of signed message
+* - const uint8_t *pk: pointer to bit-packed public key
+*
+* Returns 0 if signed message could be verified correctly and -1 otherwise
+**************************************************/
+int crypto_sign_open(uint8_t *m,
+ size_t *mlen,
+ const uint8_t *sm,
+ size_t smlen,
+ const uint8_t *pk)
+{
+ size_t i;
+
+ if(smlen < CRYPTO_BYTES)
+ goto badsig;
+
+ *mlen = smlen - CRYPTO_BYTES;
+ if(crypto_sign_verify(sm, CRYPTO_BYTES, sm + CRYPTO_BYTES, *mlen, pk))
+ goto badsig;
+ else {
+ /* All good, copy msg, return 0 */
+ for(i = 0; i < *mlen; ++i)
+ m[i] = sm[CRYPTO_BYTES + i];
+ return 0;
+ }
+
+badsig:
+ /* Signature verification failed */
+ *mlen = -1;
+ for(i = 0; i < smlen; ++i)
+ m[i] = 0;
+
+ return -1;
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.h
new file mode 100644
index 000000000..295f378c0
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/sign.h
@@ -0,0 +1,36 @@
+#ifndef SIGN_H
+#define SIGN_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include "params.h"
+#include "polyvec.h"
+#include "poly.h"
+
+#define challenge DILITHIUM_NAMESPACE(challenge)
+void challenge(poly *c, const uint8_t seed[SEEDBYTES]);
+
+#define crypto_sign_keypair DILITHIUM_NAMESPACE(keypair)
+int crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
+
+#define crypto_sign_signature DILITHIUM_NAMESPACE(signature)
+int crypto_sign_signature(uint8_t *sig, size_t *siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+#define crypto_sign DILITHIUM_NAMESPACETOP
+int crypto_sign(uint8_t *sm, size_t *smlen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *sk);
+
+#define crypto_sign_verify DILITHIUM_NAMESPACE(verify)
+int crypto_sign_verify(const uint8_t *sig, size_t siglen,
+ const uint8_t *m, size_t mlen,
+ const uint8_t *pk);
+
+#define crypto_sign_open DILITHIUM_NAMESPACE(open)
+int crypto_sign_open(uint8_t *m, size_t *mlen,
+ const uint8_t *sm, size_t smlen,
+ const uint8_t *pk);
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric-shake.c b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric-shake.c
new file mode 100644
index 000000000..963f64981
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric-shake.c
@@ -0,0 +1,28 @@
+#include <stdint.h>
+#include "params.h"
+#include "symmetric.h"
+#include "fips202.h"
+
+void dilithium_shake128_stream_init(shake128incctx *state, const uint8_t seed[SEEDBYTES], uint16_t nonce)
+{
+ uint8_t t[2];
+ t[0] = nonce;
+ t[1] = nonce >> 8;
+
+ shake128_inc_init(state);
+ shake128_inc_absorb(state, seed, SEEDBYTES);
+ shake128_inc_absorb(state, t, 2);
+ shake128_inc_finalize(state);
+}
+
+void dilithium_shake256_stream_init(shake256incctx *state, const uint8_t seed[CRHBYTES], uint16_t nonce)
+{
+ uint8_t t[2];
+ t[0] = nonce;
+ t[1] = nonce >> 8;
+
+ shake256_inc_init(state);
+ shake256_inc_absorb(state, seed, CRHBYTES);
+ shake256_inc_absorb(state, t, 2);
+ shake256_inc_finalize(state);
+}
diff --git a/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric.h b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric.h
new file mode 100644
index 000000000..eb24363f9
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/symmetric.h
@@ -0,0 +1,69 @@
+#ifndef SYMMETRIC_H
+#define SYMMETRIC_H
+
+#include <stdint.h>
+#include "params.h"
+
+#ifdef DILITHIUM_USE_AES
+
+#include "aes256ctr.h"
+#include "fips202.h"
+
+typedef aes256ctr_ctx stream128_state;
+typedef aes256ctr_ctx stream256_state;
+
+#define dilithium_aes256ctr_init DILITHIUM_NAMESPACE(dilithium_aes256ctr_init)
+void dilithium_aes256ctr_init(aes256ctr_ctx *state,
+ const uint8_t key[32],
+ uint16_t nonce);
+
+#define STREAM128_BLOCKBYTES AES256CTR_BLOCKBYTES
+#define STREAM256_BLOCKBYTES AES256CTR_BLOCKBYTES
+
+#define stream128_init(STATE, SEED, NONCE) \
+ dilithium_aes256ctr_init(STATE, SEED, NONCE)
+#define stream128_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ aes256ctr_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream128_release(STATE) \
+ aes256_ctx_release(STATE)
+#define stream256_init(STATE, SEED, NONCE) \
+ dilithium_aes256ctr_init(STATE, SEED, NONCE)
+#define stream256_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ aes256ctr_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream256_release(STATE) \
+ aes256_ctx_release(STATE)
+
+#else
+
+#include "fips202.h"
+
+typedef shake128incctx stream128_state;
+typedef shake256incctx stream256_state;
+
+#define dilithium_shake128_stream_init DILITHIUM_NAMESPACE(dilithium_shake128_stream_init)
+void dilithium_shake128_stream_init(shake128incctx *state,
+ const uint8_t seed[SEEDBYTES],
+ uint16_t nonce);
+
+#define dilithium_shake256_stream_init DILITHIUM_NAMESPACE(dilithium_shake256_stream_init)
+void dilithium_shake256_stream_init(shake256incctx *state,
+ const uint8_t seed[CRHBYTES],
+ uint16_t nonce);
+
+#define STREAM128_BLOCKBYTES SHAKE128_RATE
+#define STREAM256_BLOCKBYTES SHAKE256_RATE
+
+#define stream128_init(STATE, SEED, NONCE) \
+ dilithium_shake128_stream_init(STATE, SEED, NONCE)
+#define stream128_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ shake128_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream128_release(STATE) shake128_inc_ctx_release(STATE)
+#define stream256_init(STATE, SEED, NONCE) \
+ dilithium_shake256_stream_init(STATE, SEED, NONCE)
+#define stream256_squeezeblocks(OUT, OUTBLOCKS, STATE) \
+ shake256_squeezeblocks(OUT, OUTBLOCKS, STATE)
+#define stream256_release(STATE) shake256_inc_ctx_release(STATE)
+
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/sig_dilithium.h b/lib/liboqs/src/sig/dilithium/sig_dilithium.h
new file mode 100644
index 000000000..04b6b8841
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/sig_dilithium.h
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: MIT
+
+#ifndef OQS_SIG_DILITHIUM_H
+#define OQS_SIG_DILITHIUM_H
+
+#include <oqs/oqs.h>
+
+#ifdef OQS_ENABLE_SIG_dilithium_2
+#define OQS_SIG_dilithium_2_length_public_key 1312
+#define OQS_SIG_dilithium_2_length_secret_key 2528
+#define OQS_SIG_dilithium_2_length_signature 2420
+
+OQS_SIG *OQS_SIG_dilithium_2_new(void);
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_keypair(uint8_t *public_key, uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key);
+#endif
+
+#ifdef OQS_ENABLE_SIG_dilithium_3
+#define OQS_SIG_dilithium_3_length_public_key 1952
+#define OQS_SIG_dilithium_3_length_secret_key 4000
+#define OQS_SIG_dilithium_3_length_signature 3293
+
+OQS_SIG *OQS_SIG_dilithium_3_new(void);
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_keypair(uint8_t *public_key, uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key);
+#endif
+
+#ifdef OQS_ENABLE_SIG_dilithium_5
+#define OQS_SIG_dilithium_5_length_public_key 2592
+#define OQS_SIG_dilithium_5_length_secret_key 4864
+#define OQS_SIG_dilithium_5_length_signature 4595
+
+OQS_SIG *OQS_SIG_dilithium_5_new(void);
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_keypair(uint8_t *public_key, uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key);
+#endif
+
+#ifdef OQS_ENABLE_SIG_dilithium_2_aes
+#define OQS_SIG_dilithium_2_aes_length_public_key 1312
+#define OQS_SIG_dilithium_2_aes_length_secret_key 2528
+#define OQS_SIG_dilithium_2_aes_length_signature 2420
+
+OQS_SIG *OQS_SIG_dilithium_2_aes_new(void);
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_aes_keypair(uint8_t *public_key, uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_aes_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_aes_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key);
+#endif
+
+#ifdef OQS_ENABLE_SIG_dilithium_3_aes
+#define OQS_SIG_dilithium_3_aes_length_public_key 1952
+#define OQS_SIG_dilithium_3_aes_length_secret_key 4000
+#define OQS_SIG_dilithium_3_aes_length_signature 3293
+
+OQS_SIG *OQS_SIG_dilithium_3_aes_new(void);
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_aes_keypair(uint8_t *public_key, uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_aes_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_aes_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key);
+#endif
+
+#ifdef OQS_ENABLE_SIG_dilithium_5_aes
+#define OQS_SIG_dilithium_5_aes_length_public_key 2592
+#define OQS_SIG_dilithium_5_aes_length_secret_key 4864
+#define OQS_SIG_dilithium_5_aes_length_signature 4595
+
+OQS_SIG *OQS_SIG_dilithium_5_aes_new(void);
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_aes_keypair(uint8_t *public_key, uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_aes_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key);
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_aes_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key);
+#endif
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/sig_dilithium_2.c b/lib/liboqs/src/sig/dilithium/sig_dilithium_2.c
new file mode 100644
index 000000000..de1b2ad1f
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/sig_dilithium_2.c
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: MIT
+
+#include <stdlib.h>
+
+#include <oqs/sig_dilithium.h>
+
+#if defined(OQS_ENABLE_SIG_dilithium_2)
+
+OQS_SIG *OQS_SIG_dilithium_2_new(void) {
+
+ OQS_SIG *sig = malloc(sizeof(OQS_SIG));
+ if (sig == NULL) {
+ return NULL;
+ }
+ sig->method_name = OQS_SIG_alg_dilithium_2;
+ sig->alg_version = "https://github.com/pq-crystals/dilithium/commit/d9c885d3f2e11c05529eeeb7d70d808c972b8409";
+
+ sig->claimed_nist_level = 2;
+ sig->euf_cma = true;
+
+ sig->length_public_key = OQS_SIG_dilithium_2_length_public_key;
+ sig->length_secret_key = OQS_SIG_dilithium_2_length_secret_key;
+ sig->length_signature = OQS_SIG_dilithium_2_length_signature;
+
+ sig->keypair = OQS_SIG_dilithium_2_keypair;
+ sig->sign = OQS_SIG_dilithium_2_sign;
+ sig->verify = OQS_SIG_dilithium_2_verify;
+
+ return sig;
+}
+
+extern int pqcrystals_dilithium2_ref_keypair(uint8_t *pk, uint8_t *sk);
+extern int pqcrystals_dilithium2_ref_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int pqcrystals_dilithium2_ref_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+
+#if defined(OQS_ENABLE_SIG_dilithium_2_avx2)
+extern int pqcrystals_dilithium2_avx2_keypair(uint8_t *pk, uint8_t *sk);
+extern int pqcrystals_dilithium2_avx2_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int pqcrystals_dilithium2_avx2_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+#endif
+
+#if defined(OQS_ENABLE_SIG_dilithium_2_aarch64)
+extern int PQCLEAN_DILITHIUM2_AARCH64_crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
+extern int PQCLEAN_DILITHIUM2_AARCH64_crypto_sign_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int PQCLEAN_DILITHIUM2_AARCH64_crypto_sign_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+#endif
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_keypair(uint8_t *public_key, uint8_t *secret_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_2_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium2_avx2_keypair(public_key, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_keypair(public_key, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_2_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM2_AARCH64_crypto_sign_keypair(public_key, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_keypair(public_key, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_keypair(public_key, secret_key);
+#endif
+}
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_2_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium2_avx2_signature(signature, signature_len, message, message_len, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_signature(signature, signature_len, message, message_len, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_2_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM2_AARCH64_crypto_sign_signature(signature, signature_len, message, message_len, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_signature(signature, signature_len, message, message_len, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_signature(signature, signature_len, message, message_len, secret_key);
+#endif
+}
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_2_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_2_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium2_avx2_verify(signature, signature_len, message, message_len, public_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_verify(signature, signature_len, message, message_len, public_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_2_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM2_AARCH64_crypto_sign_verify(signature, signature_len, message, message_len, public_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_verify(signature, signature_len, message, message_len, public_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium2_ref_verify(signature, signature_len, message, message_len, public_key);
+#endif
+}
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/sig_dilithium_3.c b/lib/liboqs/src/sig/dilithium/sig_dilithium_3.c
new file mode 100644
index 000000000..f1a8311a2
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/sig_dilithium_3.c
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: MIT
+
+#include <stdlib.h>
+
+#include <oqs/sig_dilithium.h>
+
+#if defined(OQS_ENABLE_SIG_dilithium_3)
+
+OQS_SIG *OQS_SIG_dilithium_3_new(void) {
+
+ OQS_SIG *sig = malloc(sizeof(OQS_SIG));
+ if (sig == NULL) {
+ return NULL;
+ }
+ sig->method_name = OQS_SIG_alg_dilithium_3;
+ sig->alg_version = "https://github.com/pq-crystals/dilithium/commit/d9c885d3f2e11c05529eeeb7d70d808c972b8409";
+
+ sig->claimed_nist_level = 3;
+ sig->euf_cma = true;
+
+ sig->length_public_key = OQS_SIG_dilithium_3_length_public_key;
+ sig->length_secret_key = OQS_SIG_dilithium_3_length_secret_key;
+ sig->length_signature = OQS_SIG_dilithium_3_length_signature;
+
+ sig->keypair = OQS_SIG_dilithium_3_keypair;
+ sig->sign = OQS_SIG_dilithium_3_sign;
+ sig->verify = OQS_SIG_dilithium_3_verify;
+
+ return sig;
+}
+
+extern int pqcrystals_dilithium3_ref_keypair(uint8_t *pk, uint8_t *sk);
+extern int pqcrystals_dilithium3_ref_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int pqcrystals_dilithium3_ref_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+
+#if defined(OQS_ENABLE_SIG_dilithium_3_avx2)
+extern int pqcrystals_dilithium3_avx2_keypair(uint8_t *pk, uint8_t *sk);
+extern int pqcrystals_dilithium3_avx2_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int pqcrystals_dilithium3_avx2_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+#endif
+
+#if defined(OQS_ENABLE_SIG_dilithium_3_aarch64)
+extern int PQCLEAN_DILITHIUM3_AARCH64_crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
+extern int PQCLEAN_DILITHIUM3_AARCH64_crypto_sign_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int PQCLEAN_DILITHIUM3_AARCH64_crypto_sign_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+#endif
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_keypair(uint8_t *public_key, uint8_t *secret_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_3_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium3_avx2_keypair(public_key, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_keypair(public_key, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_3_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM3_AARCH64_crypto_sign_keypair(public_key, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_keypair(public_key, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_keypair(public_key, secret_key);
+#endif
+}
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_3_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium3_avx2_signature(signature, signature_len, message, message_len, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_signature(signature, signature_len, message, message_len, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_3_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM3_AARCH64_crypto_sign_signature(signature, signature_len, message, message_len, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_signature(signature, signature_len, message, message_len, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_signature(signature, signature_len, message, message_len, secret_key);
+#endif
+}
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_3_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_3_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium3_avx2_verify(signature, signature_len, message, message_len, public_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_verify(signature, signature_len, message, message_len, public_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_3_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM3_AARCH64_crypto_sign_verify(signature, signature_len, message, message_len, public_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_verify(signature, signature_len, message, message_len, public_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium3_ref_verify(signature, signature_len, message, message_len, public_key);
+#endif
+}
+
+#endif
diff --git a/lib/liboqs/src/sig/dilithium/sig_dilithium_5.c b/lib/liboqs/src/sig/dilithium/sig_dilithium_5.c
new file mode 100644
index 000000000..06871be6e
--- /dev/null
+++ b/lib/liboqs/src/sig/dilithium/sig_dilithium_5.c
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: MIT
+
+#include <stdlib.h>
+
+#include <oqs/sig_dilithium.h>
+
+#if defined(OQS_ENABLE_SIG_dilithium_5)
+
+OQS_SIG *OQS_SIG_dilithium_5_new(void) {
+
+ OQS_SIG *sig = malloc(sizeof(OQS_SIG));
+ if (sig == NULL) {
+ return NULL;
+ }
+ sig->method_name = OQS_SIG_alg_dilithium_5;
+ sig->alg_version = "https://github.com/pq-crystals/dilithium/commit/d9c885d3f2e11c05529eeeb7d70d808c972b8409";
+
+ sig->claimed_nist_level = 5;
+ sig->euf_cma = true;
+
+ sig->length_public_key = OQS_SIG_dilithium_5_length_public_key;
+ sig->length_secret_key = OQS_SIG_dilithium_5_length_secret_key;
+ sig->length_signature = OQS_SIG_dilithium_5_length_signature;
+
+ sig->keypair = OQS_SIG_dilithium_5_keypair;
+ sig->sign = OQS_SIG_dilithium_5_sign;
+ sig->verify = OQS_SIG_dilithium_5_verify;
+
+ return sig;
+}
+
+extern int pqcrystals_dilithium5_ref_keypair(uint8_t *pk, uint8_t *sk);
+extern int pqcrystals_dilithium5_ref_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int pqcrystals_dilithium5_ref_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+
+#if defined(OQS_ENABLE_SIG_dilithium_5_avx2)
+extern int pqcrystals_dilithium5_avx2_keypair(uint8_t *pk, uint8_t *sk);
+extern int pqcrystals_dilithium5_avx2_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int pqcrystals_dilithium5_avx2_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+#endif
+
+#if defined(OQS_ENABLE_SIG_dilithium_5_aarch64)
+extern int PQCLEAN_DILITHIUM5_AARCH64_crypto_sign_keypair(uint8_t *pk, uint8_t *sk);
+extern int PQCLEAN_DILITHIUM5_AARCH64_crypto_sign_signature(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk);
+extern int PQCLEAN_DILITHIUM5_AARCH64_crypto_sign_verify(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk);
+#endif
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_keypair(uint8_t *public_key, uint8_t *secret_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_5_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium5_avx2_keypair(public_key, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_keypair(public_key, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_5_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM5_AARCH64_crypto_sign_keypair(public_key, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_keypair(public_key, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_keypair(public_key, secret_key);
+#endif
+}
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_sign(uint8_t *signature, size_t *signature_len, const uint8_t *message, size_t message_len, const uint8_t *secret_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_5_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium5_avx2_signature(signature, signature_len, message, message_len, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_signature(signature, signature_len, message, message_len, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_5_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM5_AARCH64_crypto_sign_signature(signature, signature_len, message, message_len, secret_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_signature(signature, signature_len, message, message_len, secret_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_signature(signature, signature_len, message, message_len, secret_key);
+#endif
+}
+
+OQS_API OQS_STATUS OQS_SIG_dilithium_5_verify(const uint8_t *message, size_t message_len, const uint8_t *signature, size_t signature_len, const uint8_t *public_key) {
+#if defined(OQS_ENABLE_SIG_dilithium_5_avx2)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_AVX2) && OQS_CPU_has_extension(OQS_CPU_EXT_POPCNT)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) pqcrystals_dilithium5_avx2_verify(signature, signature_len, message, message_len, public_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_verify(signature, signature_len, message, message_len, public_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#elif defined(OQS_ENABLE_SIG_dilithium_5_aarch64)
+#if defined(OQS_DIST_BUILD)
+ if (OQS_CPU_has_extension(OQS_CPU_EXT_ARM_NEON)) {
+#endif /* OQS_DIST_BUILD */
+ return (OQS_STATUS) PQCLEAN_DILITHIUM5_AARCH64_crypto_sign_verify(signature, signature_len, message, message_len, public_key);
+#if defined(OQS_DIST_BUILD)
+ } else {
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_verify(signature, signature_len, message, message_len, public_key);
+ }
+#endif /* OQS_DIST_BUILD */
+#else
+ return (OQS_STATUS) pqcrystals_dilithium5_ref_verify(signature, signature_len, message, message_len, public_key);
+#endif
+}
+
+#endif