From f0797a032fe71f4b1bff627dc9079d380be257c0 Mon Sep 17 00:00:00 2001 From: Kris Kwiatkowski Date: Sat, 20 Feb 2021 01:45:07 +0000 Subject: [PATCH] Reorg --- CMakeLists.txt | 143 ++++++++++++++---- .../{ntrup => ntru_prime}/ntrulpr653/META.yml | 0 .../ntrulpr653/avx2/LICENSE | 0 .../ntrulpr653/avx2/api.h | 0 .../avx2/crypto_core_multsntrup653.c | 0 .../avx2/crypto_core_multsntrup653.h | 0 .../avx2/crypto_core_multsntrup653_ntt.c | 0 .../avx2/crypto_core_multsntrup653_ntt.h | 0 .../ntrulpr653/avx2/crypto_decode_256x16.c | 0 .../ntrulpr653/avx2/crypto_decode_256x16.h | 0 .../ntrulpr653/avx2/crypto_decode_256x2.c | 0 .../ntrulpr653/avx2/crypto_decode_256x2.h | 0 .../ntrulpr653/avx2/crypto_decode_653x1541.c | 0 .../ntrulpr653/avx2/crypto_decode_653x1541.h | 0 .../ntrulpr653/avx2/crypto_decode_653x3.c | 0 .../ntrulpr653/avx2/crypto_decode_653x3.h | 0 .../ntrulpr653/avx2/crypto_decode_653xint16.c | 0 .../ntrulpr653/avx2/crypto_decode_653xint16.h | 0 .../ntrulpr653/avx2/crypto_decode_653xint32.c | 0 .../ntrulpr653/avx2/crypto_decode_653xint32.h | 0 .../ntrulpr653/avx2/crypto_encode_256x16.c | 0 .../ntrulpr653/avx2/crypto_encode_256x16.h | 0 .../ntrulpr653/avx2/crypto_encode_256x2.c | 0 .../ntrulpr653/avx2/crypto_encode_256x2.h | 0 .../ntrulpr653/avx2/crypto_encode_653x1541.c | 0 .../ntrulpr653/avx2/crypto_encode_653x1541.h | 0 .../avx2/crypto_encode_653x1541round.c | 0 .../avx2/crypto_encode_653x1541round.h | 0 .../ntrulpr653/avx2/crypto_encode_653x3.c | 0 .../ntrulpr653/avx2/crypto_encode_653x3.h | 0 .../ntrulpr653/avx2/crypto_encode_653xint16.c | 0 .../ntrulpr653/avx2/crypto_encode_653xint16.h | 0 .../ntrulpr653/avx2/crypto_sort_int32.c | 0 .../ntrulpr653/avx2/crypto_sort_int32.h | 0 .../ntrulpr653/avx2/crypto_sort_uint32.c | 0 .../ntrulpr653/avx2/crypto_sort_uint32.h | 0 .../ntrulpr653/avx2/crypto_stream_aes256ctr.c | 0 .../ntrulpr653/avx2/crypto_stream_aes256ctr.h | 0 .../ntrulpr653/avx2/crypto_verify_1025.c | 0 .../ntrulpr653/avx2/crypto_verify_1025.h | 0 .../ntrulpr653/avx2/kem.c | 0 .../ntrulpr653/avx2/params.h | 0 .../ntrulpr653/clean/LICENSE | 0 .../ntrulpr653/clean/Makefile.Microsoft_nmake | 0 .../ntrulpr653/clean/api.h | 0 .../clean/crypto_core_multsntrup653.c | 0 .../clean/crypto_core_multsntrup653.h | 0 .../ntrulpr653/clean/crypto_decode_256x16.c | 0 .../ntrulpr653/clean/crypto_decode_256x16.h | 0 .../ntrulpr653/clean/crypto_decode_256x2.c | 0 .../ntrulpr653/clean/crypto_decode_256x2.h | 0 .../ntrulpr653/clean/crypto_decode_653x1541.c | 0 .../ntrulpr653/clean/crypto_decode_653x1541.h | 0 .../ntrulpr653/clean/crypto_decode_653x3.c | 0 .../ntrulpr653/clean/crypto_decode_653x3.h | 0 .../clean/crypto_decode_653xint16.c | 0 .../clean/crypto_decode_653xint16.h | 0 .../clean/crypto_decode_653xint32.c | 0 .../clean/crypto_decode_653xint32.h | 0 .../ntrulpr653/clean/crypto_encode_256x16.c | 0 .../ntrulpr653/clean/crypto_encode_256x16.h | 0 .../ntrulpr653/clean/crypto_encode_256x2.c | 0 .../ntrulpr653/clean/crypto_encode_256x2.h | 0 .../ntrulpr653/clean/crypto_encode_653x1541.c | 0 .../ntrulpr653/clean/crypto_encode_653x1541.h | 0 .../clean/crypto_encode_653x1541round.c | 0 .../clean/crypto_encode_653x1541round.h | 0 .../ntrulpr653/clean/crypto_encode_653x3.c | 0 .../ntrulpr653/clean/crypto_encode_653x3.h | 0 .../clean/crypto_encode_653xint16.c | 0 .../clean/crypto_encode_653xint16.h | 0 .../ntrulpr653/clean/crypto_sort_int32.c | 0 .../ntrulpr653/clean/crypto_sort_int32.h | 0 .../ntrulpr653/clean/crypto_sort_uint32.c | 0 .../ntrulpr653/clean/crypto_sort_uint32.h | 0 .../clean/crypto_stream_aes256ctr.c | 0 .../clean/crypto_stream_aes256ctr.h | 0 .../ntrulpr653/clean/crypto_verify_1025.c | 0 .../ntrulpr653/clean/crypto_verify_1025.h | 0 .../ntrulpr653/clean/kem.c | 0 .../ntrulpr653/clean/params.h | 0 .../{ntrup => ntru_prime}/ntrulpr761/META.yml | 0 .../ntrulpr761/avx2/LICENSE | 0 .../ntrulpr761/avx2/api.h | 0 .../avx2/crypto_core_multsntrup761.c | 0 .../avx2/crypto_core_multsntrup761.h | 0 .../avx2/crypto_core_multsntrup761_ntt.c | 0 .../avx2/crypto_core_multsntrup761_ntt.h | 0 .../ntrulpr761/avx2/crypto_decode_256x16.c | 0 .../ntrulpr761/avx2/crypto_decode_256x16.h | 0 .../ntrulpr761/avx2/crypto_decode_256x2.c | 0 .../ntrulpr761/avx2/crypto_decode_256x2.h | 0 .../ntrulpr761/avx2/crypto_decode_761x1531.c | 0 .../ntrulpr761/avx2/crypto_decode_761x1531.h | 0 .../ntrulpr761/avx2/crypto_decode_761x3.c | 0 .../ntrulpr761/avx2/crypto_decode_761x3.h | 0 .../ntrulpr761/avx2/crypto_decode_761xint16.c | 0 .../ntrulpr761/avx2/crypto_decode_761xint16.h | 0 .../ntrulpr761/avx2/crypto_decode_761xint32.c | 0 .../ntrulpr761/avx2/crypto_decode_761xint32.h | 0 .../ntrulpr761/avx2/crypto_encode_256x16.c | 0 .../ntrulpr761/avx2/crypto_encode_256x16.h | 0 .../ntrulpr761/avx2/crypto_encode_256x2.c | 0 .../ntrulpr761/avx2/crypto_encode_256x2.h | 0 .../ntrulpr761/avx2/crypto_encode_761x1531.c | 0 .../ntrulpr761/avx2/crypto_encode_761x1531.h | 0 .../avx2/crypto_encode_761x1531round.c | 0 .../avx2/crypto_encode_761x1531round.h | 0 .../ntrulpr761/avx2/crypto_encode_761x3.c | 0 .../ntrulpr761/avx2/crypto_encode_761x3.h | 0 .../ntrulpr761/avx2/crypto_encode_761xint16.c | 0 .../ntrulpr761/avx2/crypto_encode_761xint16.h | 0 .../ntrulpr761/avx2/crypto_sort_int32.c | 0 .../ntrulpr761/avx2/crypto_sort_int32.h | 0 .../ntrulpr761/avx2/crypto_sort_uint32.c | 0 .../ntrulpr761/avx2/crypto_sort_uint32.h | 0 .../ntrulpr761/avx2/crypto_stream_aes256ctr.c | 0 .../ntrulpr761/avx2/crypto_stream_aes256ctr.h | 0 .../ntrulpr761/avx2/crypto_verify_1167.c | 0 .../ntrulpr761/avx2/crypto_verify_1167.h | 0 .../ntrulpr761/avx2/kem.c | 0 .../ntrulpr761/avx2/params.h | 0 .../ntrulpr761/clean/LICENSE | 0 .../ntrulpr761/clean/Makefile.Microsoft_nmake | 0 .../ntrulpr761/clean/api.h | 0 .../clean/crypto_core_multsntrup761.c | 0 .../clean/crypto_core_multsntrup761.h | 0 .../ntrulpr761/clean/crypto_decode_256x16.c | 0 .../ntrulpr761/clean/crypto_decode_256x16.h | 0 .../ntrulpr761/clean/crypto_decode_256x2.c | 0 .../ntrulpr761/clean/crypto_decode_256x2.h | 0 .../ntrulpr761/clean/crypto_decode_761x1531.c | 0 .../ntrulpr761/clean/crypto_decode_761x1531.h | 0 .../ntrulpr761/clean/crypto_decode_761x3.c | 0 .../ntrulpr761/clean/crypto_decode_761x3.h | 0 .../clean/crypto_decode_761xint16.c | 0 .../clean/crypto_decode_761xint16.h | 0 .../clean/crypto_decode_761xint32.c | 0 .../clean/crypto_decode_761xint32.h | 0 .../ntrulpr761/clean/crypto_encode_256x16.c | 0 .../ntrulpr761/clean/crypto_encode_256x16.h | 0 .../ntrulpr761/clean/crypto_encode_256x2.c | 0 .../ntrulpr761/clean/crypto_encode_256x2.h | 0 .../ntrulpr761/clean/crypto_encode_761x1531.c | 0 .../ntrulpr761/clean/crypto_encode_761x1531.h | 0 .../clean/crypto_encode_761x1531round.c | 0 .../clean/crypto_encode_761x1531round.h | 0 .../ntrulpr761/clean/crypto_encode_761x3.c | 0 .../ntrulpr761/clean/crypto_encode_761x3.h | 0 .../clean/crypto_encode_761xint16.c | 0 .../clean/crypto_encode_761xint16.h | 0 .../ntrulpr761/clean/crypto_sort_int32.c | 0 .../ntrulpr761/clean/crypto_sort_int32.h | 0 .../ntrulpr761/clean/crypto_sort_uint32.c | 0 .../ntrulpr761/clean/crypto_sort_uint32.h | 0 .../clean/crypto_stream_aes256ctr.c | 0 .../clean/crypto_stream_aes256ctr.h | 0 .../ntrulpr761/clean/crypto_verify_1167.c | 0 .../ntrulpr761/clean/crypto_verify_1167.h | 0 .../ntrulpr761/clean/kem.c | 0 .../ntrulpr761/clean/params.h | 0 .../{ntrup => ntru_prime}/ntrulpr857/META.yml | 0 .../ntrulpr857/avx2/LICENSE | 0 .../ntrulpr857/avx2/api.h | 0 .../avx2/crypto_core_multsntrup857.c | 0 .../avx2/crypto_core_multsntrup857.h | 0 .../avx2/crypto_core_multsntrup857_ntt.c | 0 .../avx2/crypto_core_multsntrup857_ntt.h | 0 .../ntrulpr857/avx2/crypto_decode_256x16.c | 0 .../ntrulpr857/avx2/crypto_decode_256x16.h | 0 .../ntrulpr857/avx2/crypto_decode_256x2.c | 0 .../ntrulpr857/avx2/crypto_decode_256x2.h | 0 .../ntrulpr857/avx2/crypto_decode_857x1723.c | 0 .../ntrulpr857/avx2/crypto_decode_857x1723.h | 0 .../ntrulpr857/avx2/crypto_decode_857x3.c | 0 .../ntrulpr857/avx2/crypto_decode_857x3.h | 0 .../ntrulpr857/avx2/crypto_decode_857xint16.c | 0 .../ntrulpr857/avx2/crypto_decode_857xint16.h | 0 .../ntrulpr857/avx2/crypto_decode_857xint32.c | 0 .../ntrulpr857/avx2/crypto_decode_857xint32.h | 0 .../ntrulpr857/avx2/crypto_encode_256x16.c | 0 .../ntrulpr857/avx2/crypto_encode_256x16.h | 0 .../ntrulpr857/avx2/crypto_encode_256x2.c | 0 .../ntrulpr857/avx2/crypto_encode_256x2.h | 0 .../ntrulpr857/avx2/crypto_encode_857x1723.c | 0 .../ntrulpr857/avx2/crypto_encode_857x1723.h | 0 .../avx2/crypto_encode_857x1723round.c | 0 .../avx2/crypto_encode_857x1723round.h | 0 .../ntrulpr857/avx2/crypto_encode_857x3.c | 0 .../ntrulpr857/avx2/crypto_encode_857x3.h | 0 .../ntrulpr857/avx2/crypto_encode_857xint16.c | 0 .../ntrulpr857/avx2/crypto_encode_857xint16.h | 0 .../ntrulpr857/avx2/crypto_sort_int32.c | 0 .../ntrulpr857/avx2/crypto_sort_int32.h | 0 .../ntrulpr857/avx2/crypto_sort_uint32.c | 0 .../ntrulpr857/avx2/crypto_sort_uint32.h | 0 .../ntrulpr857/avx2/crypto_stream_aes256ctr.c | 0 .../ntrulpr857/avx2/crypto_stream_aes256ctr.h | 0 .../ntrulpr857/avx2/crypto_verify_1312.c | 0 .../ntrulpr857/avx2/crypto_verify_1312.h | 0 .../ntrulpr857/avx2/kem.c | 0 .../ntrulpr857/avx2/params.h | 0 .../ntrulpr857/clean/LICENSE | 0 .../ntrulpr857/clean/Makefile.Microsoft_nmake | 0 .../ntrulpr857/clean/api.h | 0 .../clean/crypto_core_multsntrup857.c | 0 .../clean/crypto_core_multsntrup857.h | 0 .../ntrulpr857/clean/crypto_decode_256x16.c | 0 .../ntrulpr857/clean/crypto_decode_256x16.h | 0 .../ntrulpr857/clean/crypto_decode_256x2.c | 0 .../ntrulpr857/clean/crypto_decode_256x2.h | 0 .../ntrulpr857/clean/crypto_decode_857x1723.c | 0 .../ntrulpr857/clean/crypto_decode_857x1723.h | 0 .../ntrulpr857/clean/crypto_decode_857x3.c | 0 .../ntrulpr857/clean/crypto_decode_857x3.h | 0 .../clean/crypto_decode_857xint16.c | 0 .../clean/crypto_decode_857xint16.h | 0 .../clean/crypto_decode_857xint32.c | 0 .../clean/crypto_decode_857xint32.h | 0 .../ntrulpr857/clean/crypto_encode_256x16.c | 0 .../ntrulpr857/clean/crypto_encode_256x16.h | 0 .../ntrulpr857/clean/crypto_encode_256x2.c | 0 .../ntrulpr857/clean/crypto_encode_256x2.h | 0 .../ntrulpr857/clean/crypto_encode_857x1723.c | 0 .../ntrulpr857/clean/crypto_encode_857x1723.h | 0 .../clean/crypto_encode_857x1723round.c | 0 .../clean/crypto_encode_857x1723round.h | 0 .../ntrulpr857/clean/crypto_encode_857x3.c | 0 .../ntrulpr857/clean/crypto_encode_857x3.h | 0 .../clean/crypto_encode_857xint16.c | 0 .../clean/crypto_encode_857xint16.h | 0 .../ntrulpr857/clean/crypto_sort_int32.c | 0 .../ntrulpr857/clean/crypto_sort_int32.h | 0 .../ntrulpr857/clean/crypto_sort_uint32.c | 0 .../ntrulpr857/clean/crypto_sort_uint32.h | 0 .../clean/crypto_stream_aes256ctr.c | 0 .../clean/crypto_stream_aes256ctr.h | 0 .../ntrulpr857/clean/crypto_verify_1312.c | 0 .../ntrulpr857/clean/crypto_verify_1312.h | 0 .../ntrulpr857/clean/kem.c | 0 .../ntrulpr857/clean/params.h | 0 241 files changed, 115 insertions(+), 28 deletions(-) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/META.yml (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/LICENSE (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/api.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_core_multsntrup653.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_core_multsntrup653.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653x1541.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653x1541.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653xint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_decode_653xint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653x1541.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653x1541.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653x1541round.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653x1541round.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_encode_653xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_sort_int32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_sort_int32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_sort_uint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_sort_uint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_stream_aes256ctr.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_stream_aes256ctr.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_verify_1025.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/crypto_verify_1025.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/kem.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/avx2/params.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/LICENSE (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/Makefile.Microsoft_nmake (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/api.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_core_multsntrup653.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_core_multsntrup653.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653x1541.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653x1541.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653xint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_decode_653xint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653x1541.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653x1541.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653x1541round.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653x1541round.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_encode_653xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_sort_int32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_sort_int32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_sort_uint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_sort_uint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_stream_aes256ctr.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_stream_aes256ctr.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_verify_1025.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/crypto_verify_1025.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/kem.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr653/clean/params.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/META.yml (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/LICENSE (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/api.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_core_multsntrup761.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_core_multsntrup761.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761x1531.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761x1531.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761xint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_decode_761xint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761x1531.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761x1531.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761x1531round.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761x1531round.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_encode_761xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_sort_int32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_sort_int32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_sort_uint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_sort_uint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_stream_aes256ctr.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_stream_aes256ctr.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_verify_1167.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/crypto_verify_1167.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/kem.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/avx2/params.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/LICENSE (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/Makefile.Microsoft_nmake (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/api.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_core_multsntrup761.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_core_multsntrup761.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761x1531.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761x1531.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761xint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_decode_761xint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761x1531.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761x1531.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761x1531round.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761x1531round.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_encode_761xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_sort_int32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_sort_int32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_sort_uint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_sort_uint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_stream_aes256ctr.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_stream_aes256ctr.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_verify_1167.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/crypto_verify_1167.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/kem.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr761/clean/params.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/META.yml (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/LICENSE (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/api.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_core_multsntrup857.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_core_multsntrup857.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857x1723.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857x1723.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857xint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_decode_857xint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857x1723.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857x1723.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857x1723round.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857x1723round.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_encode_857xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_sort_int32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_sort_int32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_sort_uint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_sort_uint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_stream_aes256ctr.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_stream_aes256ctr.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_verify_1312.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/crypto_verify_1312.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/kem.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/avx2/params.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/LICENSE (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/Makefile.Microsoft_nmake (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/api.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_core_multsntrup857.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_core_multsntrup857.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857x1723.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857x1723.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857xint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_decode_857xint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_256x16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_256x16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_256x2.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_256x2.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857x1723.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857x1723.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857x1723round.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857x1723round.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857x3.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857x3.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857xint16.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_encode_857xint16.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_sort_int32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_sort_int32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_sort_uint32.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_sort_uint32.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_stream_aes256ctr.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_stream_aes256ctr.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_verify_1312.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/crypto_verify_1312.h (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/kem.c (100%) rename crypto_kem/{ntrup => ntru_prime}/ntrulpr857/clean/params.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9b5ea37..cd8c321d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,23 +198,61 @@ define_sig_alg(dilithium5_clean set( SRC_CLEAN_KYBER512 - crypto_kem/kyber512/clean/cbd.c - crypto_kem/kyber512/clean/indcpa.c - crypto_kem/kyber512/clean/kem.c - crypto_kem/kyber512/clean/ntt.c - crypto_kem/kyber512/clean/poly.c - crypto_kem/kyber512/clean/polyvec.c - crypto_kem/kyber512/clean/reduce.c - crypto_kem/kyber512/clean/symmetric-shake.c - crypto_kem/kyber512/clean/verify.c + crypto_kem/kyber/kyber512/clean/cbd.c + crypto_kem/kyber/kyber512/clean/indcpa.c + crypto_kem/kyber/kyber512/clean/kem.c + crypto_kem/kyber/kyber512/clean/ntt.c + crypto_kem/kyber/kyber512/clean/poly.c + crypto_kem/kyber/kyber512/clean/polyvec.c + crypto_kem/kyber/kyber512/clean/reduce.c + crypto_kem/kyber/kyber512/clean/symmetric-shake.c + crypto_kem/kyber/kyber512/clean/verify.c ) set( INC_CLEAN_KYBER512 - crypto_kem/kyber512/clean + crypto_kem/kyber/kyber512/clean ) define_kem_alg(kyber512_clean PQCLEAN_KYBER512_CLEAN "${SRC_CLEAN_KYBER512}" "${INC_CLEAN_KYBER512}") +set( + SRC_CLEAN_KYBER768 + crypto_kem/kyber/kyber768/clean/cbd.c + crypto_kem/kyber/kyber768/clean/indcpa.c + crypto_kem/kyber/kyber768/clean/kem.c + crypto_kem/kyber/kyber768/clean/ntt.c + crypto_kem/kyber/kyber768/clean/poly.c + crypto_kem/kyber/kyber768/clean/polyvec.c + crypto_kem/kyber/kyber768/clean/reduce.c + crypto_kem/kyber/kyber768/clean/symmetric-shake.c + crypto_kem/kyber/kyber768/clean/verify.c +) +set( + INC_CLEAN_KYBER768 + crypto_kem/kyber/kyber768/clean +) +define_kem_alg(kyber768_clean + PQCLEAN_KYBER768_CLEAN "${SRC_CLEAN_KYBER768}" "${INC_CLEAN_KYBER768}") + +set( + SRC_CLEAN_KYBER1024 + crypto_kem/kyber/kyber1024/clean/cbd.c + crypto_kem/kyber/kyber1024/clean/indcpa.c + crypto_kem/kyber/kyber1024/clean/kem.c + crypto_kem/kyber/kyber1024/clean/ntt.c + crypto_kem/kyber/kyber1024/clean/poly.c + crypto_kem/kyber/kyber1024/clean/polyvec.c + crypto_kem/kyber/kyber1024/clean/reduce.c + crypto_kem/kyber/kyber1024/clean/symmetric-shake.c + crypto_kem/kyber/kyber1024/clean/verify.c +) +set( + INC_CLEAN_KYBER1024 + crypto_kem/kyber/kyber1024/clean +) +define_kem_alg(kyber1024_clean + PQCLEAN_KYBER1024_CLEAN "${SRC_CLEAN_KYBER1024}" "${INC_CLEAN_KYBER1024}") + # AVX2 targets if(${ARCH} STREQUAL "ARCH_x86_64") @@ -291,30 +329,79 @@ define_sig_alg(dilithium5_avx2 set( SRC_AVX2_KYBER512 - crypto_kem/kyber512/avx2/cbd.c - crypto_kem/kyber512/avx2/consts.c - crypto_kem/kyber512/avx2/fips202x4.c - crypto_kem/kyber512/avx2/indcpa.c - crypto_kem/kyber512/avx2/kem.c - crypto_kem/kyber512/avx2/poly.c - crypto_kem/kyber512/avx2/polyvec.c - crypto_kem/kyber512/avx2/rejsample.c - crypto_kem/kyber512/avx2/symmetric-shake.c - crypto_kem/kyber512/avx2/verify.c - crypto_kem/kyber512/avx2/basemul.S - crypto_kem/kyber512/avx2/fq.S - crypto_kem/kyber512/avx2/invntt.S - crypto_kem/kyber512/avx2/ntt.S - crypto_kem/kyber512/avx2/shuffle.S + crypto_kem/kyber/kyber512/avx2/cbd.c + crypto_kem/kyber/kyber512/avx2/consts.c + crypto_kem/kyber/kyber512/avx2/fips202x4.c + crypto_kem/kyber/kyber512/avx2/indcpa.c + crypto_kem/kyber/kyber512/avx2/kem.c + crypto_kem/kyber/kyber512/avx2/poly.c + crypto_kem/kyber/kyber512/avx2/polyvec.c + crypto_kem/kyber/kyber512/avx2/rejsample.c + crypto_kem/kyber/kyber512/avx2/symmetric-shake.c + crypto_kem/kyber/kyber512/avx2/verify.c + crypto_kem/kyber/kyber512/avx2/basemul.S + crypto_kem/kyber/kyber512/avx2/fq.S + crypto_kem/kyber/kyber512/avx2/invntt.S + crypto_kem/kyber/kyber512/avx2/ntt.S + crypto_kem/kyber/kyber512/avx2/shuffle.S ) - set( INC_AVX2_KYBER512 - crypto_kem/kyber512/avx2 + crypto_kem/kyber/kyber512/avx2 ) - define_kem_alg(kyber512_avx2 PQCLEAN_KYBER512_AVX2 "${SRC_AVX2_KYBER512}" "${INC_AVX2_KYBER512}") + +set( + SRC_AVX2_KYBER768 + crypto_kem/kyber/kyber768/avx2/cbd.c + crypto_kem/kyber/kyber768/avx2/consts.c + crypto_kem/kyber/kyber768/avx2/fips202x4.c + crypto_kem/kyber/kyber768/avx2/indcpa.c + crypto_kem/kyber/kyber768/avx2/kem.c + crypto_kem/kyber/kyber768/avx2/poly.c + crypto_kem/kyber/kyber768/avx2/polyvec.c + crypto_kem/kyber/kyber768/avx2/rejsample.c + crypto_kem/kyber/kyber768/avx2/symmetric-shake.c + crypto_kem/kyber/kyber768/avx2/verify.c + crypto_kem/kyber/kyber768/avx2/basemul.S + crypto_kem/kyber/kyber768/avx2/fq.S + crypto_kem/kyber/kyber768/avx2/invntt.S + crypto_kem/kyber/kyber768/avx2/ntt.S + crypto_kem/kyber/kyber768/avx2/shuffle.S +) +set( + INC_AVX2_KYBER768 + crypto_kem/kyber/kyber768/avx2 +) +define_kem_alg(kyber768_avx2 + PQCLEAN_KYBER768_AVX2 "${SRC_AVX2_KYBER768}" "${INC_AVX2_KYBER768}") + +set( + SRC_AVX2_KYBER1024 + crypto_kem/kyber/kyber1024/avx2/cbd.c + crypto_kem/kyber/kyber1024/avx2/consts.c + crypto_kem/kyber/kyber1024/avx2/fips202x4.c + crypto_kem/kyber/kyber1024/avx2/indcpa.c + crypto_kem/kyber/kyber1024/avx2/kem.c + crypto_kem/kyber/kyber1024/avx2/poly.c + crypto_kem/kyber/kyber1024/avx2/polyvec.c + crypto_kem/kyber/kyber1024/avx2/rejsample.c + crypto_kem/kyber/kyber1024/avx2/symmetric-shake.c + crypto_kem/kyber/kyber1024/avx2/verify.c + crypto_kem/kyber/kyber1024/avx2/basemul.S + crypto_kem/kyber/kyber1024/avx2/fq.S + crypto_kem/kyber/kyber1024/avx2/invntt.S + crypto_kem/kyber/kyber1024/avx2/ntt.S + crypto_kem/kyber/kyber1024/avx2/shuffle.S +) +set( + INC_AVX2_KYBER1024 + crypto_kem/kyber/kyber1024/avx2 +) +define_kem_alg(kyber1024_avx2 + PQCLEAN_KYBER1024_AVX2 "${SRC_AVX2_KYBER1024}" "${INC_AVX2_KYBER1024}") + endif() # The rest of the library diff --git a/crypto_kem/ntrup/ntrulpr653/META.yml b/crypto_kem/ntru_prime/ntrulpr653/META.yml similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/META.yml rename to crypto_kem/ntru_prime/ntrulpr653/META.yml diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/LICENSE b/crypto_kem/ntru_prime/ntrulpr653/avx2/LICENSE similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/LICENSE rename to crypto_kem/ntru_prime/ntrulpr653/avx2/LICENSE diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/api.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/api.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/api.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/api.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_core_multsntrup653_ntt.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x16.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x16.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x2.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x2.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x1541.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x1541.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x1541.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x1541.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x1541.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x1541.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x1541.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x1541.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x3.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x3.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x3.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x3.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653x3.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653x3.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint16.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint16.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint16.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint16.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint16.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint16.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint32.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint32.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint32.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint32.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_decode_653xint32.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_decode_653xint32.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x16.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x16.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x2.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x2.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541round.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541round.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541round.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541round.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541round.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541round.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x1541round.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x1541round.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x3.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x3.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x3.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x3.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653x3.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653x3.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653xint16.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653xint16.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653xint16.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653xint16.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_encode_653xint16.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_encode_653xint16.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_int32.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_int32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_int32.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_int32.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_int32.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_int32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_int32.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_int32.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_uint32.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_uint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_uint32.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_uint32.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_uint32.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_uint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_sort_uint32.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_sort_uint32.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_stream_aes256ctr.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_stream_aes256ctr.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_stream_aes256ctr.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_stream_aes256ctr.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_stream_aes256ctr.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_stream_aes256ctr.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_stream_aes256ctr.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_stream_aes256ctr.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_verify_1025.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_verify_1025.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_verify_1025.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_verify_1025.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/crypto_verify_1025.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_verify_1025.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/crypto_verify_1025.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/crypto_verify_1025.h diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/kem.c b/crypto_kem/ntru_prime/ntrulpr653/avx2/kem.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/kem.c rename to crypto_kem/ntru_prime/ntrulpr653/avx2/kem.c diff --git a/crypto_kem/ntrup/ntrulpr653/avx2/params.h b/crypto_kem/ntru_prime/ntrulpr653/avx2/params.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/avx2/params.h rename to crypto_kem/ntru_prime/ntrulpr653/avx2/params.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/LICENSE b/crypto_kem/ntru_prime/ntrulpr653/clean/LICENSE similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/LICENSE rename to crypto_kem/ntru_prime/ntrulpr653/clean/LICENSE diff --git a/crypto_kem/ntrup/ntrulpr653/clean/Makefile.Microsoft_nmake b/crypto_kem/ntru_prime/ntrulpr653/clean/Makefile.Microsoft_nmake similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/Makefile.Microsoft_nmake rename to crypto_kem/ntru_prime/ntrulpr653/clean/Makefile.Microsoft_nmake diff --git a/crypto_kem/ntrup/ntrulpr653/clean/api.h b/crypto_kem/ntru_prime/ntrulpr653/clean/api.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/api.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/api.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_core_multsntrup653.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_core_multsntrup653.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_core_multsntrup653.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_core_multsntrup653.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_core_multsntrup653.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_core_multsntrup653.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_core_multsntrup653.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_core_multsntrup653.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x16.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x16.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x2.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x2.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x1541.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x1541.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x1541.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x1541.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x1541.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x1541.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x1541.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x1541.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x3.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x3.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x3.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x3.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653x3.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653x3.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint16.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint16.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint16.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint16.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint16.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint16.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint32.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint32.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint32.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint32.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_decode_653xint32.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_decode_653xint32.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x16.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x16.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x2.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x2.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541round.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541round.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541round.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541round.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541round.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541round.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x1541round.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x1541round.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x3.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x3.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x3.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x3.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653x3.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653x3.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653xint16.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653xint16.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653xint16.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653xint16.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_encode_653xint16.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_encode_653xint16.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_int32.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_int32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_int32.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_int32.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_int32.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_int32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_int32.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_int32.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_uint32.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_uint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_uint32.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_uint32.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_uint32.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_uint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_sort_uint32.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_sort_uint32.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_stream_aes256ctr.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_stream_aes256ctr.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_stream_aes256ctr.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_stream_aes256ctr.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_stream_aes256ctr.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_stream_aes256ctr.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_stream_aes256ctr.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_stream_aes256ctr.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_verify_1025.c b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_verify_1025.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_verify_1025.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_verify_1025.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/crypto_verify_1025.h b/crypto_kem/ntru_prime/ntrulpr653/clean/crypto_verify_1025.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/crypto_verify_1025.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/crypto_verify_1025.h diff --git a/crypto_kem/ntrup/ntrulpr653/clean/kem.c b/crypto_kem/ntru_prime/ntrulpr653/clean/kem.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/kem.c rename to crypto_kem/ntru_prime/ntrulpr653/clean/kem.c diff --git a/crypto_kem/ntrup/ntrulpr653/clean/params.h b/crypto_kem/ntru_prime/ntrulpr653/clean/params.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr653/clean/params.h rename to crypto_kem/ntru_prime/ntrulpr653/clean/params.h diff --git a/crypto_kem/ntrup/ntrulpr761/META.yml b/crypto_kem/ntru_prime/ntrulpr761/META.yml similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/META.yml rename to crypto_kem/ntru_prime/ntrulpr761/META.yml diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/LICENSE b/crypto_kem/ntru_prime/ntrulpr761/avx2/LICENSE similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/LICENSE rename to crypto_kem/ntru_prime/ntrulpr761/avx2/LICENSE diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/api.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/api.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/api.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/api.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_core_multsntrup761_ntt.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x16.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x16.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x2.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x2.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x1531.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x1531.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x1531.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x1531.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x1531.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x1531.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x1531.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x1531.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x3.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x3.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x3.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x3.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761x3.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761x3.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint16.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint16.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint16.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint16.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint16.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint16.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint32.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint32.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint32.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint32.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_decode_761xint32.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_decode_761xint32.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x16.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x16.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x2.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x2.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531round.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531round.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531round.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531round.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531round.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531round.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x1531round.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x1531round.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x3.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x3.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x3.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x3.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761x3.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761x3.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761xint16.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761xint16.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761xint16.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761xint16.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_encode_761xint16.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_encode_761xint16.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_int32.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_int32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_int32.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_int32.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_int32.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_int32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_int32.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_int32.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_uint32.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_uint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_uint32.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_uint32.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_uint32.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_uint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_sort_uint32.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_sort_uint32.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_stream_aes256ctr.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_stream_aes256ctr.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_stream_aes256ctr.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_stream_aes256ctr.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_stream_aes256ctr.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_stream_aes256ctr.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_stream_aes256ctr.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_stream_aes256ctr.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_verify_1167.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_verify_1167.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_verify_1167.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_verify_1167.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/crypto_verify_1167.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_verify_1167.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/crypto_verify_1167.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/crypto_verify_1167.h diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/kem.c b/crypto_kem/ntru_prime/ntrulpr761/avx2/kem.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/kem.c rename to crypto_kem/ntru_prime/ntrulpr761/avx2/kem.c diff --git a/crypto_kem/ntrup/ntrulpr761/avx2/params.h b/crypto_kem/ntru_prime/ntrulpr761/avx2/params.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/avx2/params.h rename to crypto_kem/ntru_prime/ntrulpr761/avx2/params.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/LICENSE b/crypto_kem/ntru_prime/ntrulpr761/clean/LICENSE similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/LICENSE rename to crypto_kem/ntru_prime/ntrulpr761/clean/LICENSE diff --git a/crypto_kem/ntrup/ntrulpr761/clean/Makefile.Microsoft_nmake b/crypto_kem/ntru_prime/ntrulpr761/clean/Makefile.Microsoft_nmake similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/Makefile.Microsoft_nmake rename to crypto_kem/ntru_prime/ntrulpr761/clean/Makefile.Microsoft_nmake diff --git a/crypto_kem/ntrup/ntrulpr761/clean/api.h b/crypto_kem/ntru_prime/ntrulpr761/clean/api.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/api.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/api.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_core_multsntrup761.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_core_multsntrup761.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_core_multsntrup761.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_core_multsntrup761.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_core_multsntrup761.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_core_multsntrup761.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_core_multsntrup761.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_core_multsntrup761.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x16.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x16.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x2.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x2.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x1531.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x1531.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x1531.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x1531.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x1531.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x1531.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x1531.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x1531.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x3.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x3.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x3.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x3.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761x3.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761x3.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint16.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint16.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint16.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint16.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint16.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint16.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint32.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint32.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint32.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint32.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_decode_761xint32.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_decode_761xint32.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x16.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x16.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x2.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x2.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531round.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531round.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531round.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531round.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531round.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531round.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x1531round.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x1531round.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x3.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x3.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x3.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x3.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761x3.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761x3.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761xint16.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761xint16.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761xint16.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761xint16.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_encode_761xint16.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_encode_761xint16.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_int32.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_int32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_int32.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_int32.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_int32.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_int32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_int32.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_int32.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_uint32.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_uint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_uint32.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_uint32.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_uint32.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_uint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_sort_uint32.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_sort_uint32.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_stream_aes256ctr.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_stream_aes256ctr.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_stream_aes256ctr.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_stream_aes256ctr.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_stream_aes256ctr.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_stream_aes256ctr.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_stream_aes256ctr.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_stream_aes256ctr.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_verify_1167.c b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_verify_1167.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_verify_1167.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_verify_1167.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/crypto_verify_1167.h b/crypto_kem/ntru_prime/ntrulpr761/clean/crypto_verify_1167.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/crypto_verify_1167.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/crypto_verify_1167.h diff --git a/crypto_kem/ntrup/ntrulpr761/clean/kem.c b/crypto_kem/ntru_prime/ntrulpr761/clean/kem.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/kem.c rename to crypto_kem/ntru_prime/ntrulpr761/clean/kem.c diff --git a/crypto_kem/ntrup/ntrulpr761/clean/params.h b/crypto_kem/ntru_prime/ntrulpr761/clean/params.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr761/clean/params.h rename to crypto_kem/ntru_prime/ntrulpr761/clean/params.h diff --git a/crypto_kem/ntrup/ntrulpr857/META.yml b/crypto_kem/ntru_prime/ntrulpr857/META.yml similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/META.yml rename to crypto_kem/ntru_prime/ntrulpr857/META.yml diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/LICENSE b/crypto_kem/ntru_prime/ntrulpr857/avx2/LICENSE similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/LICENSE rename to crypto_kem/ntru_prime/ntrulpr857/avx2/LICENSE diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/api.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/api.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/api.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/api.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_core_multsntrup857_ntt.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x16.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x16.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x2.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x2.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x1723.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x1723.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x1723.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x1723.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x1723.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x1723.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x1723.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x1723.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x3.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x3.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x3.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x3.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857x3.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857x3.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint16.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint16.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint16.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint16.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint16.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint16.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint32.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint32.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint32.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint32.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_decode_857xint32.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_decode_857xint32.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x16.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x16.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x2.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x2.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723round.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723round.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723round.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723round.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723round.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723round.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x1723round.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x1723round.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x3.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x3.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x3.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x3.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857x3.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857x3.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857xint16.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857xint16.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857xint16.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857xint16.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_encode_857xint16.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_encode_857xint16.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_int32.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_int32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_int32.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_int32.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_int32.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_int32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_int32.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_int32.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_uint32.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_uint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_uint32.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_uint32.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_uint32.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_uint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_sort_uint32.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_sort_uint32.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_stream_aes256ctr.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_stream_aes256ctr.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_stream_aes256ctr.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_stream_aes256ctr.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_stream_aes256ctr.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_stream_aes256ctr.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_stream_aes256ctr.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_stream_aes256ctr.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_verify_1312.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_verify_1312.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_verify_1312.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_verify_1312.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/crypto_verify_1312.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_verify_1312.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/crypto_verify_1312.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/crypto_verify_1312.h diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/kem.c b/crypto_kem/ntru_prime/ntrulpr857/avx2/kem.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/kem.c rename to crypto_kem/ntru_prime/ntrulpr857/avx2/kem.c diff --git a/crypto_kem/ntrup/ntrulpr857/avx2/params.h b/crypto_kem/ntru_prime/ntrulpr857/avx2/params.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/avx2/params.h rename to crypto_kem/ntru_prime/ntrulpr857/avx2/params.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/LICENSE b/crypto_kem/ntru_prime/ntrulpr857/clean/LICENSE similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/LICENSE rename to crypto_kem/ntru_prime/ntrulpr857/clean/LICENSE diff --git a/crypto_kem/ntrup/ntrulpr857/clean/Makefile.Microsoft_nmake b/crypto_kem/ntru_prime/ntrulpr857/clean/Makefile.Microsoft_nmake similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/Makefile.Microsoft_nmake rename to crypto_kem/ntru_prime/ntrulpr857/clean/Makefile.Microsoft_nmake diff --git a/crypto_kem/ntrup/ntrulpr857/clean/api.h b/crypto_kem/ntru_prime/ntrulpr857/clean/api.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/api.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/api.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_core_multsntrup857.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_core_multsntrup857.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_core_multsntrup857.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_core_multsntrup857.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_core_multsntrup857.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_core_multsntrup857.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_core_multsntrup857.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_core_multsntrup857.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x16.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x16.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x2.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x2.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x1723.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x1723.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x1723.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x1723.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x1723.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x1723.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x1723.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x1723.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x3.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x3.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x3.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x3.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857x3.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857x3.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint16.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint16.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint16.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint16.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint16.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint16.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint32.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint32.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint32.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint32.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_decode_857xint32.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_decode_857xint32.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x16.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x16.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x16.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x16.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x16.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x16.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x2.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x2.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x2.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x2.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x2.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x2.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_256x2.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_256x2.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723round.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723round.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723round.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723round.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723round.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723round.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x1723round.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x1723round.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x3.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x3.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x3.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x3.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x3.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x3.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857x3.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857x3.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857xint16.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857xint16.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857xint16.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857xint16.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857xint16.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857xint16.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_encode_857xint16.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_encode_857xint16.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_int32.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_int32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_int32.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_int32.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_int32.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_int32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_int32.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_int32.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_uint32.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_uint32.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_uint32.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_uint32.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_uint32.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_uint32.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_sort_uint32.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_sort_uint32.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_stream_aes256ctr.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_stream_aes256ctr.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_stream_aes256ctr.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_stream_aes256ctr.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_stream_aes256ctr.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_stream_aes256ctr.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_stream_aes256ctr.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_stream_aes256ctr.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_verify_1312.c b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_verify_1312.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_verify_1312.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_verify_1312.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/crypto_verify_1312.h b/crypto_kem/ntru_prime/ntrulpr857/clean/crypto_verify_1312.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/crypto_verify_1312.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/crypto_verify_1312.h diff --git a/crypto_kem/ntrup/ntrulpr857/clean/kem.c b/crypto_kem/ntru_prime/ntrulpr857/clean/kem.c similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/kem.c rename to crypto_kem/ntru_prime/ntrulpr857/clean/kem.c diff --git a/crypto_kem/ntrup/ntrulpr857/clean/params.h b/crypto_kem/ntru_prime/ntrulpr857/clean/params.h similarity index 100% rename from crypto_kem/ntrup/ntrulpr857/clean/params.h rename to crypto_kem/ntru_prime/ntrulpr857/clean/params.h