From 7c28da63db39f346a8143c89d2f23a534b544589 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <dm@cifercom.com>
Date: Fri, 12 Jan 2018 16:58:17 +0700
Subject: [PATCH] [*] Renamed crypt/ to crypto/ [+] libdap.c
---
CMakeLists.txt | 18 ++++++++++++++++--
{crypt => crypto}/CMakeLists.txt | 0
{crypt => crypto}/dap_enc.c | 0
{crypt => crypto}/dap_enc.h | 0
{crypt => crypto}/dap_enc_aes.c | 0
{crypt => crypto}/dap_enc_aes.h | 0
{crypt => crypto}/dap_enc_base64.c | 0
{crypt => crypto}/dap_enc_base64.h | 0
{crypt => crypto}/dap_enc_key.c | 0
{crypt => crypto}/dap_enc_key.h | 0
{crypt => crypto}/dap_enc_newhope.c | 0
{crypt => crypto}/dap_enc_newhope.h | 0
{crypt => crypto}/liboqs/common/common.c | 0
{crypt => crypto}/liboqs/common/common.h | 0
{crypt => crypto}/liboqs/config.h | 0
.../liboqs/crypto/aes/Makefile.am | 0
{crypt => crypto}/liboqs/crypto/aes/aes.c | 0
{crypt => crypto}/liboqs/crypto/aes/aes.h | 0
{crypt => crypto}/liboqs/crypto/aes/aes_c.c | 0
.../liboqs/crypto/aes/aes_local.h | 0
{crypt => crypto}/liboqs/crypto/aes/aes_ni.c | 0
{crypt => crypto}/liboqs/crypto/aes/test_aes.c | 0
.../liboqs/crypto/rand/Makefile.am | 0
{crypt => crypto}/liboqs/crypto/rand/rand.c | 0
{crypt => crypto}/liboqs/crypto/rand/rand.h | 0
.../liboqs/crypto/rand/test_rand.c | 0
.../crypto/rand_urandom_aesctr/Makefile.am | 0
.../rand_urandom_aesctr/rand_urandom_aesctr.c | 0
.../rand_urandom_aesctr/rand_urandom_aesctr.h | 0
.../crypto/rand_urandom_chacha20/Makefile.am | 0
.../rand_urandom_chacha20/external/LICENSE.txt | 0
.../rand_urandom_chacha20/external/chacha20.c | 0
.../external/ecrypt-config.h | 0
.../external/ecrypt-portable.h | 0
.../rand_urandom_chacha20.c | 0
.../rand_urandom_chacha20.h | 0
.../liboqs/crypto/sha3/Makefile.am | 0
{crypt => crypto}/liboqs/crypto/sha3/sha3.c | 0
{crypt => crypto}/liboqs/crypto/sha3/sha3.h | 0
{crypt => crypto}/liboqs/ds_benchmark.h | 0
{crypt => crypto}/liboqs/kex/Makefile.am | 0
{crypt => crypto}/liboqs/kex/kex.c | 0
{crypt => crypto}/liboqs/kex/kex.h | 0
{crypt => crypto}/liboqs/kex/test_kex.c | 0
.../liboqs/kex_code_mcbits/LICENSE.txt | 0
.../liboqs/kex_code_mcbits/Makefile.am | 0
.../liboqs/kex_code_mcbits/external/api.h | 0
.../liboqs/kex_code_mcbits/external/benes.c | 0
.../liboqs/kex_code_mcbits/external/bm.c | 0
.../kex_code_mcbits/external/consts.data | 0
.../liboqs/kex_code_mcbits/external/decrypt.c | 0
.../liboqs/kex_code_mcbits/external/encrypt.c | 0
.../liboqs/kex_code_mcbits/external/fft.c | 0
.../liboqs/kex_code_mcbits/external/fft_tr.c | 0
.../liboqs/kex_code_mcbits/external/gf.c | 0
.../kex_code_mcbits/external/implementors | 0
.../kex_code_mcbits/external/operations.c | 0
.../liboqs/kex_code_mcbits/external/params.h | 0
.../liboqs/kex_code_mcbits/external/pk_gen.c | 0
.../kex_code_mcbits/external/points.data | 0
.../kex_code_mcbits/external/scalars.data | 0
.../kex_code_mcbits/external/scalars_2x.data | 0
.../liboqs/kex_code_mcbits/external/sk_gen.c | 0
.../kex_code_mcbits/external/transpose.c | 0
.../liboqs/kex_code_mcbits/external/util.c | 0
.../liboqs/kex_code_mcbits/external/vec.c | 0
.../liboqs/kex_code_mcbits/kex_code_mcbits.c | 0
.../liboqs/kex_code_mcbits/kex_code_mcbits.h | 0
.../liboqs/kex_code_mcbits/mcbits.h | 0
.../liboqs/kex_lwe_frodo/Makefile.am | 0
.../liboqs/kex_lwe_frodo/kex_lwe_frodo.c | 0
.../liboqs/kex_lwe_frodo/kex_lwe_frodo.h | 0
.../kex_lwe_frodo/kex_lwe_frodo_macrify.c | 0
{crypt => crypto}/liboqs/kex_lwe_frodo/local.h | 0
{crypt => crypto}/liboqs/kex_lwe_frodo/lwe.c | 0
.../liboqs/kex_lwe_frodo/lwe_macrify.c | 0
.../liboqs/kex_lwe_frodo/lwe_noise.c | 0
.../liboqs/kex_lwe_frodo/recommended.h | 0
.../liboqs/kex_mlwe_kyber/LICENSE.txt | 0
.../liboqs/kex_mlwe_kyber/Makefile.am | 0
.../liboqs/kex_mlwe_kyber/indcpa.c | 0
.../liboqs/kex_mlwe_kyber/kex_mlwe_kyber.c | 0
.../liboqs/kex_mlwe_kyber/kex_mlwe_kyber.h | 0
.../liboqs/kex_mlwe_kyber/kyber.c | 0
{crypt => crypto}/liboqs/kex_mlwe_kyber/ntt.c | 0
.../liboqs/kex_mlwe_kyber/params.h | 0
{crypt => crypto}/liboqs/kex_mlwe_kyber/poly.c | 0
.../liboqs/kex_mlwe_kyber/polyvec.c | 0
.../liboqs/kex_mlwe_kyber/precomp.c | 0
.../liboqs/kex_mlwe_kyber/reduce.c | 0
.../liboqs/kex_mlwe_kyber/verify.c | 0
{crypt => crypto}/liboqs/kex_ntru/Makefile.am | 0
{crypt => crypto}/liboqs/kex_ntru/kex_ntru.c | 0
{crypt => crypto}/liboqs/kex_ntru/kex_ntru.h | 0
.../liboqs/kex_ntru/ntru_crypto.h | 0
.../liboqs/kex_ntru/ntru_crypto_drbg.c | 0
.../liboqs/kex_ntru/ntru_crypto_drbg.h | 0
.../liboqs/kex_ntru/ntru_crypto_error.h | 0
.../liboqs/kex_ntru/ntru_crypto_hash.c | 0
.../liboqs/kex_ntru/ntru_crypto_hash.h | 0
.../liboqs/kex_ntru/ntru_crypto_hash_basics.h | 0
.../liboqs/kex_ntru/ntru_crypto_hmac.c | 0
.../liboqs/kex_ntru/ntru_crypto_hmac.h | 0
.../kex_ntru/ntru_crypto_msbyte_uint32.c | 0
.../kex_ntru/ntru_crypto_msbyte_uint32.h | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_convert.c | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_convert.h | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_encrypt.c | 0
.../kex_ntru/ntru_crypto_ntru_encrypt_key.c | 0
.../kex_ntru/ntru_crypto_ntru_encrypt_key.h | 0
.../ntru_crypto_ntru_encrypt_param_sets.c | 0
.../ntru_crypto_ntru_encrypt_param_sets.h | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_mgf1.c | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_mgf1.h | 0
.../ntru_crypto_ntru_mult_coeffs_karat.c | 0
.../ntru_crypto_ntru_mult_coeffs_simd.c | 0
.../kex_ntru/ntru_crypto_ntru_mult_indices.c | 0
.../ntru_crypto_ntru_mult_indices_32.c | 0
.../ntru_crypto_ntru_mult_indices_64.c | 0
.../ntru_crypto_ntru_mult_indices_simd.c | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_poly.c | 0
.../liboqs/kex_ntru/ntru_crypto_ntru_poly.h | 0
.../liboqs/kex_ntru/ntru_crypto_platform.h | 0
.../liboqs/kex_ntru/ntru_crypto_sha.h | 0
.../liboqs/kex_ntru/ntru_crypto_sha1.c | 0
.../liboqs/kex_ntru/ntru_crypto_sha1.h | 0
.../liboqs/kex_ntru/ntru_crypto_sha2.c | 0
.../liboqs/kex_ntru/ntru_crypto_sha2.h | 0
.../liboqs/kex_ntru/ntru_crypto_sha256.c | 0
.../liboqs/kex_ntru/ntru_crypto_sha256.h | 0
.../liboqs/kex_rlwe_bcns15/LICENSE.txt | 0
.../liboqs/kex_rlwe_bcns15/Makefile.am | 0
{crypt => crypto}/liboqs/kex_rlwe_bcns15/fft.c | 0
.../liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.c | 0
.../liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.h | 0
.../liboqs/kex_rlwe_bcns15/local.h | 0
.../liboqs/kex_rlwe_bcns15/rlwe.c | 0
.../liboqs/kex_rlwe_bcns15/rlwe_a.h | 0
.../liboqs/kex_rlwe_bcns15/rlwe_kex.c | 0
.../liboqs/kex_rlwe_bcns15/rlwe_table.h | 0
.../liboqs/kex_rlwe_msrln16/AMD64/consts.c | 0
.../liboqs/kex_rlwe_msrln16/AMD64/error_asm.S | 0
.../liboqs/kex_rlwe_msrln16/AMD64/ntt_x64.c | 0
.../kex_rlwe_msrln16/AMD64/ntt_x64_asm.S | 0
.../liboqs/kex_rlwe_msrln16/LICENSE.txt | 0
.../liboqs/kex_rlwe_msrln16/LatticeCrypto.h | 0
.../kex_rlwe_msrln16/LatticeCrypto_kex.c | 0
.../kex_rlwe_msrln16/LatticeCrypto_priv.h | 0
.../liboqs/kex_rlwe_msrln16/Makefile.am | 0
.../liboqs/kex_rlwe_msrln16/README.txt | 0
.../liboqs/kex_rlwe_msrln16/generic/ntt.c | 0
.../liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.c | 0
.../liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h | 0
.../liboqs/kex_rlwe_msrln16/ntt_constants.c | 0
.../liboqs/kex_rlwe_newhope/LICENSE.txt | 0
.../liboqs/kex_rlwe_newhope/Makefile.am | 0
.../liboqs/kex_rlwe_newhope/avx2/Makefile.am | 0
.../liboqs/kex_rlwe_newhope/avx2/bitrev.s | 0
.../liboqs/kex_rlwe_newhope/avx2/cbd.s | 0
.../liboqs/kex_rlwe_newhope/avx2/chacha.S | 0
.../liboqs/kex_rlwe_newhope/avx2/consts.c | 0
.../liboqs/kex_rlwe_newhope/avx2/cpucycles.c | 0
.../liboqs/kex_rlwe_newhope/avx2/cpucycles.h | 0
.../kex_rlwe_newhope/avx2/crypto_hash_sha256.c | 0
.../kex_rlwe_newhope/avx2/crypto_hash_sha256.h | 0
.../kex_rlwe_newhope/avx2/crypto_stream.h | 0
.../avx2/crypto_stream_aes256ctr.c | 0
.../avx2/crypto_stream_aes256ctr.h | 0
.../avx2/crypto_stream_aes256ctr.s | 0
.../avx2/crypto_stream_chacha20.c | 0
.../avx2/crypto_stream_chacha20.h | 0
.../kex_rlwe_newhope/avx2/error_correction.c | 0
.../kex_rlwe_newhope/avx2/error_correction.h | 0
.../liboqs/kex_rlwe_newhope/avx2/fips202.c | 0
.../liboqs/kex_rlwe_newhope/avx2/fips202.h | 0
.../liboqs/kex_rlwe_newhope/avx2/hr.s | 0
.../liboqs/kex_rlwe_newhope/avx2/newhope.c | 0
.../liboqs/kex_rlwe_newhope/avx2/newhope.h | 0
.../liboqs/kex_rlwe_newhope/avx2/ntt.h | 0
.../liboqs/kex_rlwe_newhope/avx2/ntt_double.s | 0
.../liboqs/kex_rlwe_newhope/avx2/omegas.c | 0
.../liboqs/kex_rlwe_newhope/avx2/params.h | 0
.../liboqs/kex_rlwe_newhope/avx2/poly.c | 0
.../liboqs/kex_rlwe_newhope/avx2/poly.h | 0
.../kex_rlwe_newhope/avx2/poly_pointwise.s | 0
.../liboqs/kex_rlwe_newhope/avx2/precomp.c | 0
.../liboqs/kex_rlwe_newhope/avx2/randombytes.c | 0
.../liboqs/kex_rlwe_newhope/avx2/randombytes.h | 0
.../liboqs/kex_rlwe_newhope/avx2/rec.s | 0
.../liboqs/kex_rlwe_newhope/avx2/test/speed.c | 0
.../kex_rlwe_newhope/avx2/test/test_newhope.c | 0
.../avx2/test/test_statistical.c | 0
.../kex_rlwe_newhope/avx2/test/testvectors.c | 0
.../liboqs/kex_rlwe_newhope/kex_rlwe_newhope.c | 0
.../liboqs/kex_rlwe_newhope/kex_rlwe_newhope.h | 0
.../liboqs/kex_rlwe_newhope/newhope.c | 0
.../liboqs/kex_rlwe_newhope/params.h | 0
.../liboqs/kex_rlwe_newhope/poly.c | 0
.../liboqs/kex_rlwe_newhope/precomp.c | 0
.../liboqs/kex_sidh_cln16/AMD64/fp_x64.c | 0
.../liboqs/kex_sidh_cln16/AMD64/fp_x64_asm.S | 0
.../liboqs/kex_sidh_cln16/ARM64/fp_arm64.c | 0
.../liboqs/kex_sidh_cln16/ARM64/fp_arm64_asm.S | 0
.../liboqs/kex_sidh_cln16/LICENSE.txt | 0
.../liboqs/kex_sidh_cln16/Makefile.am | 0
.../liboqs/kex_sidh_cln16/README.txt | 0
{crypt => crypto}/liboqs/kex_sidh_cln16/SIDH.c | 0
{crypt => crypto}/liboqs/kex_sidh_cln16/SIDH.h | 0
.../liboqs/kex_sidh_cln16/SIDH_internal.h | 0
.../liboqs/kex_sidh_cln16/SIDH_setup.c | 0
.../liboqs/kex_sidh_cln16/ec_isogeny.c | 0
{crypt => crypto}/liboqs/kex_sidh_cln16/fpx.c | 0
.../liboqs/kex_sidh_cln16/generic/fp_generic.c | 0
.../liboqs/kex_sidh_cln16/kex_sidh_cln16.c | 0
.../liboqs/kex_sidh_cln16/kex_sidh_cln16.h | 0
.../liboqs/kex_sidh_cln16/sidh_kex.c | 0
.../liboqs/kex_sidh_iqc_ref/Makefile.am | 0
.../liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.c | 0
.../liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h | 0
.../kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.c | 0
.../kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.h | 0
.../kex_sidh_iqc_ref/sidh_elliptic_curve.c | 0
.../kex_sidh_iqc_ref/sidh_elliptic_curve.h | 0
.../kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.c | 0
.../kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.h | 0
.../liboqs/kex_sidh_iqc_ref/sidh_isogeny.c | 0
.../liboqs/kex_sidh_iqc_ref/sidh_isogeny.h | 0
.../liboqs/kex_sidh_iqc_ref/sidh_private_key.c | 0
.../liboqs/kex_sidh_iqc_ref/sidh_private_key.h | 0
.../liboqs/kex_sidh_iqc_ref/sidh_public_key.c | 0
.../liboqs/kex_sidh_iqc_ref/sidh_public_key.h | 0
.../sidh_public_key_encryption.c | 0
.../sidh_public_key_encryption.h | 0
.../sidh_public_key_validation.c | 0
.../sidh_public_key_validation.h | 0
.../kex_sidh_iqc_ref/sidh_public_param.c | 0
.../kex_sidh_iqc_ref/sidh_public_param.h | 0
.../kex_sidh_iqc_ref/sidh_quadratic_ext.c | 0
.../kex_sidh_iqc_ref/sidh_quadratic_ext.h | 0
.../liboqs/kex_sidh_iqc_ref/sidh_shared_key.c | 0
.../liboqs/kex_sidh_iqc_ref/sidh_shared_key.h | 0
.../liboqs/kex_sidh_iqc_ref/sidh_util.c | 0
.../liboqs/kex_sidh_iqc_ref/sidh_util.h | 0
{crypt => crypto}/liboqs/sig/Makefile.am | 0
{crypt => crypto}/liboqs/sig/sig.c | 0
{crypt => crypto}/liboqs/sig/sig.h | 0
{crypt => crypto}/liboqs/sig/test_sig.c | 0
.../liboqs/sig_picnic/Makefile.am | 0
.../liboqs/sig_picnic/build_picnic.sh | 0
.../liboqs/sig_picnic/oqs_sig_picnic.patch | 0
.../liboqs/sig_picnic/sig_picnic.c | 0
.../liboqs/sig_picnic/sig_picnic.h | 0
{crypt => crypto}/sig_picnic/.clang-format | 0
{crypt => crypto}/sig_picnic/.gitignore | 0
{crypt => crypto}/sig_picnic/.travis-build.sh | 0
{crypt => crypto}/sig_picnic/.travis-script.sh | 0
{crypt => crypto}/sig_picnic/.travis.yml | 0
{crypt => crypto}/sig_picnic/AUTHORS | 0
{crypt => crypto}/sig_picnic/CMakeLists.txt | 0
{crypt => crypto}/sig_picnic/L1_FS/api.h | 0
{crypt => crypto}/sig_picnic/L1_FS/sign.c | 0
{crypt => crypto}/sig_picnic/L1_UR/api.h | 0
{crypt => crypto}/sig_picnic/L1_UR/sign.c | 0
{crypt => crypto}/sig_picnic/L3_FS/api.h | 0
{crypt => crypto}/sig_picnic/L3_FS/sign.c | 0
{crypt => crypto}/sig_picnic/L3_UR/api.h | 0
{crypt => crypto}/sig_picnic/L3_UR/sign.c | 0
{crypt => crypto}/sig_picnic/L5_FS/api.h | 0
{crypt => crypto}/sig_picnic/L5_FS/sign.c | 0
{crypt => crypto}/sig_picnic/L5_UR/api.h | 0
{crypt => crypto}/sig_picnic/L5_UR/sign.c | 0
{crypt => crypto}/sig_picnic/LICENSE | 0
{crypt => crypto}/sig_picnic/README.md | 0
{crypt => crypto}/sig_picnic/aligned_alloc.c | 0
{crypt => crypto}/sig_picnic/bitstream.c | 0
{crypt => crypto}/sig_picnic/bitstream.h | 0
.../sig_picnic/cmake/CheckSIMD.cmake | 0
.../sig_picnic/cmake/Findm4ri.cmake | 0
.../sig_picnic/cmake/check-simd.c | 0
{crypt => crypto}/sig_picnic/compat.h | 0
{crypt => crypto}/sig_picnic/config.h.in | 0
{crypt => crypto}/sig_picnic/cpu.c | 0
{crypt => crypto}/sig_picnic/cpu.h | 0
{crypt => crypto}/sig_picnic/crypto_sign.h | 0
{crypt => crypto}/sig_picnic/endian_compat.h | 0
{crypt => crypto}/sig_picnic/io.c | 0
{crypt => crypto}/sig_picnic/io.h | 0
{crypt => crypto}/sig_picnic/kdf_shake.c | 0
{crypt => crypto}/sig_picnic/kdf_shake.h | 0
{crypt => crypto}/sig_picnic/lowmc.c | 0
{crypt => crypto}/sig_picnic/lowmc.h | 0
.../sig_picnic/lowmc_128_128_20.c | 0
.../sig_picnic/lowmc_128_128_20.h | 0
.../sig_picnic/lowmc_192_192_30.c | 0
.../sig_picnic/lowmc_192_192_30.h | 0
.../sig_picnic/lowmc_256_256_38.c | 0
.../sig_picnic/lowmc_256_256_38.h | 0
{crypt => crypto}/sig_picnic/lowmc_pars.c | 0
{crypt => crypto}/sig_picnic/lowmc_pars.h | 0
{crypt => crypto}/sig_picnic/macros.h | 0
{crypt => crypto}/sig_picnic/mpc.c | 0
{crypt => crypto}/sig_picnic/mpc.h | 0
{crypt => crypto}/sig_picnic/mpc_lowmc.c | 0
{crypt => crypto}/sig_picnic/mpc_lowmc.h | 0
{crypt => crypto}/sig_picnic/mzd_additional.c | 0
{crypt => crypto}/sig_picnic/mzd_additional.h | 0
{crypt => crypto}/sig_picnic/picnic.c | 0
{crypt => crypto}/sig_picnic/picnic.h | 0
{crypt => crypto}/sig_picnic/picnic_impl.c | 0
{crypt => crypto}/sig_picnic/picnic_impl.h | 0
{crypt => crypto}/sig_picnic/randomness.c | 0
{crypt => crypto}/sig_picnic/randomness.h | 0
{crypt => crypto}/sig_picnic/sha3/KeccakHash.c | 0
{crypt => crypto}/sig_picnic/sha3/KeccakHash.h | 0
.../sig_picnic/sha3/KeccakSponge.c | 0
.../sig_picnic/sha3/KeccakSponge.h | 0
.../sig_picnic/sha3/KeccakSponge.inc | 0
{crypt => crypto}/sig_picnic/sha3/Phases.h | 0
.../sig_picnic/sha3/SnP-Relaned.h | 0
{crypt => crypto}/sig_picnic/sha3/align.h | 0
.../sha3/armv8a-neon/KeccakP-1600-SnP.h | 0
.../armv8a-neon/KeccakP-1600-armv8a-neon.s | 0
.../sig_picnic/sha3/avx2/KeccakP-1600-AVX2.cpp | 0
.../sig_picnic/sha3/avx2/KeccakP-1600-AVX2.h | 0
.../sig_picnic/sha3/avx2/KeccakP-1600-SnP.h | 0
{crypt => crypto}/sig_picnic/sha3/brg_endian.h | 0
.../sha3/opt64/KeccakP-1600-64.macros | 0
.../sig_picnic/sha3/opt64/KeccakP-1600-SnP.h | 0
.../sha3/opt64/KeccakP-1600-opt64-config.h | 0
.../sig_picnic/sha3/opt64/KeccakP-1600-opt64.c | 0
.../sha3/opt64/KeccakP-1600-unrolling.macros | 0
{crypt => crypto}/sig_picnic/sign.c.template | 0
{crypt => crypto}/sig_picnic/simd.h | 0
{crypt => crypto}/sig_picnic/test.py | 0
.../sig_picnic/tests/CMakeLists.txt | 0
{crypt => crypto}/sig_picnic/tests/api_test.c | 0
.../sig_picnic/tests/bitstream_test.c | 0
.../sig_picnic/tests/extended_picnic_test.c | 0
.../sig_picnic/tests/hmac_sha256_test.c | 0
.../sig_picnic/tests/hmac_sha384_test.c | 0
.../sig_picnic/tests/hmac_sha512_test.c | 0
.../sig_picnic/tests/kdf_shake256_test.c | 0
.../sig_picnic/tests/lowmc_test.c | 0
{crypt => crypto}/sig_picnic/tests/mpc_test.c | 0
{crypt => crypto}/sig_picnic/tests/mzd_test.c | 0
.../sig_picnic/tests/picnic_test.c | 0
{crypt => crypto}/sig_picnic/tests/utils.c.i | 0
{crypt => crypto}/sig_picnic/timing.c | 0
{crypt => crypto}/sig_picnic/timing.h | 0
{crypt => crypto}/sig_picnic/tools/bench.c | 0
{crypt => crypto}/sig_picnic/tools/example.c | 0
{crypt => crypto}/sig_picnic/tools/genparams.c | 0
.../sig_picnic/tools/visualize_signature.c | 0
{crypt => crypto}/test.c | 0
libdap.c | 0
355 files changed, 16 insertions(+), 2 deletions(-)
rename {crypt => crypto}/CMakeLists.txt (100%)
rename {crypt => crypto}/dap_enc.c (100%)
rename {crypt => crypto}/dap_enc.h (100%)
rename {crypt => crypto}/dap_enc_aes.c (100%)
rename {crypt => crypto}/dap_enc_aes.h (100%)
rename {crypt => crypto}/dap_enc_base64.c (100%)
rename {crypt => crypto}/dap_enc_base64.h (100%)
rename {crypt => crypto}/dap_enc_key.c (100%)
rename {crypt => crypto}/dap_enc_key.h (100%)
rename {crypt => crypto}/dap_enc_newhope.c (100%)
rename {crypt => crypto}/dap_enc_newhope.h (100%)
rename {crypt => crypto}/liboqs/common/common.c (100%)
rename {crypt => crypto}/liboqs/common/common.h (100%)
rename {crypt => crypto}/liboqs/config.h (100%)
rename {crypt => crypto}/liboqs/crypto/aes/Makefile.am (100%)
rename {crypt => crypto}/liboqs/crypto/aes/aes.c (100%)
rename {crypt => crypto}/liboqs/crypto/aes/aes.h (100%)
rename {crypt => crypto}/liboqs/crypto/aes/aes_c.c (100%)
rename {crypt => crypto}/liboqs/crypto/aes/aes_local.h (100%)
rename {crypt => crypto}/liboqs/crypto/aes/aes_ni.c (100%)
rename {crypt => crypto}/liboqs/crypto/aes/test_aes.c (100%)
rename {crypt => crypto}/liboqs/crypto/rand/Makefile.am (100%)
rename {crypt => crypto}/liboqs/crypto/rand/rand.c (100%)
rename {crypt => crypto}/liboqs/crypto/rand/rand.h (100%)
rename {crypt => crypto}/liboqs/crypto/rand/test_rand.c (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_aesctr/Makefile.am (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.h (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/Makefile.am (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/external/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/external/chacha20.c (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-config.h (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-portable.h (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c (100%)
rename {crypt => crypto}/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.h (100%)
rename {crypt => crypto}/liboqs/crypto/sha3/Makefile.am (100%)
rename {crypt => crypto}/liboqs/crypto/sha3/sha3.c (100%)
rename {crypt => crypto}/liboqs/crypto/sha3/sha3.h (100%)
rename {crypt => crypto}/liboqs/ds_benchmark.h (100%)
rename {crypt => crypto}/liboqs/kex/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex/kex.c (100%)
rename {crypt => crypto}/liboqs/kex/kex.h (100%)
rename {crypt => crypto}/liboqs/kex/test_kex.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/api.h (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/benes.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/bm.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/consts.data (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/decrypt.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/encrypt.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/fft.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/fft_tr.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/gf.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/implementors (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/operations.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/params.h (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/pk_gen.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/points.data (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/scalars.data (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/scalars_2x.data (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/sk_gen.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/transpose.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/util.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/external/vec.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/kex_code_mcbits.c (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/kex_code_mcbits.h (100%)
rename {crypt => crypto}/liboqs/kex_code_mcbits/mcbits.h (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/kex_lwe_frodo.c (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/kex_lwe_frodo.h (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/kex_lwe_frodo_macrify.c (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/local.h (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/lwe.c (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/lwe_macrify.c (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/lwe_noise.c (100%)
rename {crypt => crypto}/liboqs/kex_lwe_frodo/recommended.h (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/indcpa.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.h (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/kyber.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/ntt.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/params.h (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/poly.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/polyvec.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/precomp.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/reduce.c (100%)
rename {crypt => crypto}/liboqs/kex_mlwe_kyber/verify.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_ntru/kex_ntru.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/kex_ntru.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_drbg.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_drbg.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_error.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_hash.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_hash.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_hash_basics.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_hmac.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_hmac.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_convert.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_convert.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_encrypt.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_karat.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_simd.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_32.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_64.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_simd.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_poly.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_ntru_poly.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_platform.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha1.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha1.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha2.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha2.h (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha256.c (100%)
rename {crypt => crypto}/liboqs/kex_ntru/ntru_crypto_sha256.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/fft.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/local.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/rlwe.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/rlwe_a.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/rlwe_kex.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_bcns15/rlwe_table.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/AMD64/consts.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/AMD64/error_asm.S (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64_asm.S (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/LatticeCrypto.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/LatticeCrypto_kex.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/LatticeCrypto_priv.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/README.txt (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/generic/ntt.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_msrln16/ntt_constants.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/bitrev.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/cbd.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/chacha.S (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/consts.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/cpucycles.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/cpucycles.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_stream.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/error_correction.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/error_correction.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/fips202.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/fips202.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/hr.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/newhope.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/newhope.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/ntt.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/ntt_double.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/omegas.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/params.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/poly.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/poly.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/poly_pointwise.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/precomp.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/randombytes.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/randombytes.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/rec.s (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/test/speed.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/test/test_newhope.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/test/test_statistical.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/avx2/test/testvectors.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/newhope.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/params.h (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/poly.c (100%)
rename {crypt => crypto}/liboqs/kex_rlwe_newhope/precomp.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/AMD64/fp_x64.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/AMD64/fp_x64_asm.S (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/ARM64/fp_arm64.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/ARM64/fp_arm64_asm.S (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/LICENSE.txt (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/README.txt (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/SIDH.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/SIDH.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/SIDH_internal.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/SIDH_setup.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/ec_isogeny.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/fpx.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/generic/fp_generic.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/kex_sidh_cln16.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/kex_sidh_cln16.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_cln16/sidh_kex.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/Makefile.am (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_isogeny.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_isogeny.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_private_key.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_private_key.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_key.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_key.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_param.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_public_param.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_shared_key.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_shared_key.h (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_util.c (100%)
rename {crypt => crypto}/liboqs/kex_sidh_iqc_ref/sidh_util.h (100%)
rename {crypt => crypto}/liboqs/sig/Makefile.am (100%)
rename {crypt => crypto}/liboqs/sig/sig.c (100%)
rename {crypt => crypto}/liboqs/sig/sig.h (100%)
rename {crypt => crypto}/liboqs/sig/test_sig.c (100%)
rename {crypt => crypto}/liboqs/sig_picnic/Makefile.am (100%)
rename {crypt => crypto}/liboqs/sig_picnic/build_picnic.sh (100%)
rename {crypt => crypto}/liboqs/sig_picnic/oqs_sig_picnic.patch (100%)
rename {crypt => crypto}/liboqs/sig_picnic/sig_picnic.c (100%)
rename {crypt => crypto}/liboqs/sig_picnic/sig_picnic.h (100%)
rename {crypt => crypto}/sig_picnic/.clang-format (100%)
rename {crypt => crypto}/sig_picnic/.gitignore (100%)
rename {crypt => crypto}/sig_picnic/.travis-build.sh (100%)
rename {crypt => crypto}/sig_picnic/.travis-script.sh (100%)
rename {crypt => crypto}/sig_picnic/.travis.yml (100%)
rename {crypt => crypto}/sig_picnic/AUTHORS (100%)
rename {crypt => crypto}/sig_picnic/CMakeLists.txt (100%)
rename {crypt => crypto}/sig_picnic/L1_FS/api.h (100%)
rename {crypt => crypto}/sig_picnic/L1_FS/sign.c (100%)
rename {crypt => crypto}/sig_picnic/L1_UR/api.h (100%)
rename {crypt => crypto}/sig_picnic/L1_UR/sign.c (100%)
rename {crypt => crypto}/sig_picnic/L3_FS/api.h (100%)
rename {crypt => crypto}/sig_picnic/L3_FS/sign.c (100%)
rename {crypt => crypto}/sig_picnic/L3_UR/api.h (100%)
rename {crypt => crypto}/sig_picnic/L3_UR/sign.c (100%)
rename {crypt => crypto}/sig_picnic/L5_FS/api.h (100%)
rename {crypt => crypto}/sig_picnic/L5_FS/sign.c (100%)
rename {crypt => crypto}/sig_picnic/L5_UR/api.h (100%)
rename {crypt => crypto}/sig_picnic/L5_UR/sign.c (100%)
rename {crypt => crypto}/sig_picnic/LICENSE (100%)
rename {crypt => crypto}/sig_picnic/README.md (100%)
rename {crypt => crypto}/sig_picnic/aligned_alloc.c (100%)
rename {crypt => crypto}/sig_picnic/bitstream.c (100%)
rename {crypt => crypto}/sig_picnic/bitstream.h (100%)
rename {crypt => crypto}/sig_picnic/cmake/CheckSIMD.cmake (100%)
rename {crypt => crypto}/sig_picnic/cmake/Findm4ri.cmake (100%)
rename {crypt => crypto}/sig_picnic/cmake/check-simd.c (100%)
rename {crypt => crypto}/sig_picnic/compat.h (100%)
rename {crypt => crypto}/sig_picnic/config.h.in (100%)
rename {crypt => crypto}/sig_picnic/cpu.c (100%)
rename {crypt => crypto}/sig_picnic/cpu.h (100%)
rename {crypt => crypto}/sig_picnic/crypto_sign.h (100%)
rename {crypt => crypto}/sig_picnic/endian_compat.h (100%)
rename {crypt => crypto}/sig_picnic/io.c (100%)
rename {crypt => crypto}/sig_picnic/io.h (100%)
rename {crypt => crypto}/sig_picnic/kdf_shake.c (100%)
rename {crypt => crypto}/sig_picnic/kdf_shake.h (100%)
rename {crypt => crypto}/sig_picnic/lowmc.c (100%)
rename {crypt => crypto}/sig_picnic/lowmc.h (100%)
rename {crypt => crypto}/sig_picnic/lowmc_128_128_20.c (100%)
rename {crypt => crypto}/sig_picnic/lowmc_128_128_20.h (100%)
rename {crypt => crypto}/sig_picnic/lowmc_192_192_30.c (100%)
rename {crypt => crypto}/sig_picnic/lowmc_192_192_30.h (100%)
rename {crypt => crypto}/sig_picnic/lowmc_256_256_38.c (100%)
rename {crypt => crypto}/sig_picnic/lowmc_256_256_38.h (100%)
rename {crypt => crypto}/sig_picnic/lowmc_pars.c (100%)
rename {crypt => crypto}/sig_picnic/lowmc_pars.h (100%)
rename {crypt => crypto}/sig_picnic/macros.h (100%)
rename {crypt => crypto}/sig_picnic/mpc.c (100%)
rename {crypt => crypto}/sig_picnic/mpc.h (100%)
rename {crypt => crypto}/sig_picnic/mpc_lowmc.c (100%)
rename {crypt => crypto}/sig_picnic/mpc_lowmc.h (100%)
rename {crypt => crypto}/sig_picnic/mzd_additional.c (100%)
rename {crypt => crypto}/sig_picnic/mzd_additional.h (100%)
rename {crypt => crypto}/sig_picnic/picnic.c (100%)
rename {crypt => crypto}/sig_picnic/picnic.h (100%)
rename {crypt => crypto}/sig_picnic/picnic_impl.c (100%)
rename {crypt => crypto}/sig_picnic/picnic_impl.h (100%)
rename {crypt => crypto}/sig_picnic/randomness.c (100%)
rename {crypt => crypto}/sig_picnic/randomness.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/KeccakHash.c (100%)
rename {crypt => crypto}/sig_picnic/sha3/KeccakHash.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/KeccakSponge.c (100%)
rename {crypt => crypto}/sig_picnic/sha3/KeccakSponge.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/KeccakSponge.inc (100%)
rename {crypt => crypto}/sig_picnic/sha3/Phases.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/SnP-Relaned.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/align.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/armv8a-neon/KeccakP-1600-SnP.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/armv8a-neon/KeccakP-1600-armv8a-neon.s (100%)
rename {crypt => crypto}/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.cpp (100%)
rename {crypt => crypto}/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/avx2/KeccakP-1600-SnP.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/brg_endian.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/opt64/KeccakP-1600-64.macros (100%)
rename {crypt => crypto}/sig_picnic/sha3/opt64/KeccakP-1600-SnP.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/opt64/KeccakP-1600-opt64-config.h (100%)
rename {crypt => crypto}/sig_picnic/sha3/opt64/KeccakP-1600-opt64.c (100%)
rename {crypt => crypto}/sig_picnic/sha3/opt64/KeccakP-1600-unrolling.macros (100%)
rename {crypt => crypto}/sig_picnic/sign.c.template (100%)
rename {crypt => crypto}/sig_picnic/simd.h (100%)
rename {crypt => crypto}/sig_picnic/test.py (100%)
rename {crypt => crypto}/sig_picnic/tests/CMakeLists.txt (100%)
rename {crypt => crypto}/sig_picnic/tests/api_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/bitstream_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/extended_picnic_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/hmac_sha256_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/hmac_sha384_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/hmac_sha512_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/kdf_shake256_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/lowmc_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/mpc_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/mzd_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/picnic_test.c (100%)
rename {crypt => crypto}/sig_picnic/tests/utils.c.i (100%)
rename {crypt => crypto}/sig_picnic/timing.c (100%)
rename {crypt => crypto}/sig_picnic/timing.h (100%)
rename {crypt => crypto}/sig_picnic/tools/bench.c (100%)
rename {crypt => crypto}/sig_picnic/tools/example.c (100%)
rename {crypt => crypto}/sig_picnic/tools/genparams.c (100%)
rename {crypt => crypto}/sig_picnic/tools/visualize_signature.c (100%)
rename {crypt => crypto}/test.c (100%)
create mode 100644 libdap.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6183dacb0..77cbe49ea6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,22 @@
-project(libdap C)
+project(dap C)
cmake_minimum_required(VERSION 2.8)
add_subdirectory(core)
-add_subdirectory(crypt)
+add_subdirectory(crypto)
add_subdirectory(http)
add_subdirectory(client)
+include_directories("${dap_core_INCLUDE_DIRS}")
+include_directories("${dap_crypto_INCLUDE_DIRS}")
+include_directories("${dap_http_INCLUDE_DIRS}")
+include_directories("${dap_client_INCLUDE_DIRS}")
+
+add_definitions ("${dap_core_DEFINITIONS}")
+add_definitions ("${dap_crypto_DEFINITIONS}")
+add_definitions ("${dap_http_DEFINITIONS}")
+add_definitions ("${dap_client_DEFINITIONS}")
+
+add_library(${PROJECT_NAME} STATIC IMPORTED libdap.c )
+
+set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
+set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR} CACHE INTERNAL "${PROJECT_NAME}: Include Directories" FORCE)
diff --git a/crypt/CMakeLists.txt b/crypto/CMakeLists.txt
similarity index 100%
rename from crypt/CMakeLists.txt
rename to crypto/CMakeLists.txt
diff --git a/crypt/dap_enc.c b/crypto/dap_enc.c
similarity index 100%
rename from crypt/dap_enc.c
rename to crypto/dap_enc.c
diff --git a/crypt/dap_enc.h b/crypto/dap_enc.h
similarity index 100%
rename from crypt/dap_enc.h
rename to crypto/dap_enc.h
diff --git a/crypt/dap_enc_aes.c b/crypto/dap_enc_aes.c
similarity index 100%
rename from crypt/dap_enc_aes.c
rename to crypto/dap_enc_aes.c
diff --git a/crypt/dap_enc_aes.h b/crypto/dap_enc_aes.h
similarity index 100%
rename from crypt/dap_enc_aes.h
rename to crypto/dap_enc_aes.h
diff --git a/crypt/dap_enc_base64.c b/crypto/dap_enc_base64.c
similarity index 100%
rename from crypt/dap_enc_base64.c
rename to crypto/dap_enc_base64.c
diff --git a/crypt/dap_enc_base64.h b/crypto/dap_enc_base64.h
similarity index 100%
rename from crypt/dap_enc_base64.h
rename to crypto/dap_enc_base64.h
diff --git a/crypt/dap_enc_key.c b/crypto/dap_enc_key.c
similarity index 100%
rename from crypt/dap_enc_key.c
rename to crypto/dap_enc_key.c
diff --git a/crypt/dap_enc_key.h b/crypto/dap_enc_key.h
similarity index 100%
rename from crypt/dap_enc_key.h
rename to crypto/dap_enc_key.h
diff --git a/crypt/dap_enc_newhope.c b/crypto/dap_enc_newhope.c
similarity index 100%
rename from crypt/dap_enc_newhope.c
rename to crypto/dap_enc_newhope.c
diff --git a/crypt/dap_enc_newhope.h b/crypto/dap_enc_newhope.h
similarity index 100%
rename from crypt/dap_enc_newhope.h
rename to crypto/dap_enc_newhope.h
diff --git a/crypt/liboqs/common/common.c b/crypto/liboqs/common/common.c
similarity index 100%
rename from crypt/liboqs/common/common.c
rename to crypto/liboqs/common/common.c
diff --git a/crypt/liboqs/common/common.h b/crypto/liboqs/common/common.h
similarity index 100%
rename from crypt/liboqs/common/common.h
rename to crypto/liboqs/common/common.h
diff --git a/crypt/liboqs/config.h b/crypto/liboqs/config.h
similarity index 100%
rename from crypt/liboqs/config.h
rename to crypto/liboqs/config.h
diff --git a/crypt/liboqs/crypto/aes/Makefile.am b/crypto/liboqs/crypto/aes/Makefile.am
similarity index 100%
rename from crypt/liboqs/crypto/aes/Makefile.am
rename to crypto/liboqs/crypto/aes/Makefile.am
diff --git a/crypt/liboqs/crypto/aes/aes.c b/crypto/liboqs/crypto/aes/aes.c
similarity index 100%
rename from crypt/liboqs/crypto/aes/aes.c
rename to crypto/liboqs/crypto/aes/aes.c
diff --git a/crypt/liboqs/crypto/aes/aes.h b/crypto/liboqs/crypto/aes/aes.h
similarity index 100%
rename from crypt/liboqs/crypto/aes/aes.h
rename to crypto/liboqs/crypto/aes/aes.h
diff --git a/crypt/liboqs/crypto/aes/aes_c.c b/crypto/liboqs/crypto/aes/aes_c.c
similarity index 100%
rename from crypt/liboqs/crypto/aes/aes_c.c
rename to crypto/liboqs/crypto/aes/aes_c.c
diff --git a/crypt/liboqs/crypto/aes/aes_local.h b/crypto/liboqs/crypto/aes/aes_local.h
similarity index 100%
rename from crypt/liboqs/crypto/aes/aes_local.h
rename to crypto/liboqs/crypto/aes/aes_local.h
diff --git a/crypt/liboqs/crypto/aes/aes_ni.c b/crypto/liboqs/crypto/aes/aes_ni.c
similarity index 100%
rename from crypt/liboqs/crypto/aes/aes_ni.c
rename to crypto/liboqs/crypto/aes/aes_ni.c
diff --git a/crypt/liboqs/crypto/aes/test_aes.c b/crypto/liboqs/crypto/aes/test_aes.c
similarity index 100%
rename from crypt/liboqs/crypto/aes/test_aes.c
rename to crypto/liboqs/crypto/aes/test_aes.c
diff --git a/crypt/liboqs/crypto/rand/Makefile.am b/crypto/liboqs/crypto/rand/Makefile.am
similarity index 100%
rename from crypt/liboqs/crypto/rand/Makefile.am
rename to crypto/liboqs/crypto/rand/Makefile.am
diff --git a/crypt/liboqs/crypto/rand/rand.c b/crypto/liboqs/crypto/rand/rand.c
similarity index 100%
rename from crypt/liboqs/crypto/rand/rand.c
rename to crypto/liboqs/crypto/rand/rand.c
diff --git a/crypt/liboqs/crypto/rand/rand.h b/crypto/liboqs/crypto/rand/rand.h
similarity index 100%
rename from crypt/liboqs/crypto/rand/rand.h
rename to crypto/liboqs/crypto/rand/rand.h
diff --git a/crypt/liboqs/crypto/rand/test_rand.c b/crypto/liboqs/crypto/rand/test_rand.c
similarity index 100%
rename from crypt/liboqs/crypto/rand/test_rand.c
rename to crypto/liboqs/crypto/rand/test_rand.c
diff --git a/crypt/liboqs/crypto/rand_urandom_aesctr/Makefile.am b/crypto/liboqs/crypto/rand_urandom_aesctr/Makefile.am
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_aesctr/Makefile.am
rename to crypto/liboqs/crypto/rand_urandom_aesctr/Makefile.am
diff --git a/crypt/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c b/crypto/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c
rename to crypto/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.c
diff --git a/crypt/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.h b/crypto/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.h
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.h
rename to crypto/liboqs/crypto/rand_urandom_aesctr/rand_urandom_aesctr.h
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/Makefile.am b/crypto/liboqs/crypto/rand_urandom_chacha20/Makefile.am
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/Makefile.am
rename to crypto/liboqs/crypto/rand_urandom_chacha20/Makefile.am
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/external/LICENSE.txt b/crypto/liboqs/crypto/rand_urandom_chacha20/external/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/external/LICENSE.txt
rename to crypto/liboqs/crypto/rand_urandom_chacha20/external/LICENSE.txt
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/external/chacha20.c b/crypto/liboqs/crypto/rand_urandom_chacha20/external/chacha20.c
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/external/chacha20.c
rename to crypto/liboqs/crypto/rand_urandom_chacha20/external/chacha20.c
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-config.h b/crypto/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-config.h
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-config.h
rename to crypto/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-config.h
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-portable.h b/crypto/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-portable.h
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-portable.h
rename to crypto/liboqs/crypto/rand_urandom_chacha20/external/ecrypt-portable.h
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c b/crypto/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c
rename to crypto/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.c
diff --git a/crypt/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.h b/crypto/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.h
similarity index 100%
rename from crypt/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.h
rename to crypto/liboqs/crypto/rand_urandom_chacha20/rand_urandom_chacha20.h
diff --git a/crypt/liboqs/crypto/sha3/Makefile.am b/crypto/liboqs/crypto/sha3/Makefile.am
similarity index 100%
rename from crypt/liboqs/crypto/sha3/Makefile.am
rename to crypto/liboqs/crypto/sha3/Makefile.am
diff --git a/crypt/liboqs/crypto/sha3/sha3.c b/crypto/liboqs/crypto/sha3/sha3.c
similarity index 100%
rename from crypt/liboqs/crypto/sha3/sha3.c
rename to crypto/liboqs/crypto/sha3/sha3.c
diff --git a/crypt/liboqs/crypto/sha3/sha3.h b/crypto/liboqs/crypto/sha3/sha3.h
similarity index 100%
rename from crypt/liboqs/crypto/sha3/sha3.h
rename to crypto/liboqs/crypto/sha3/sha3.h
diff --git a/crypt/liboqs/ds_benchmark.h b/crypto/liboqs/ds_benchmark.h
similarity index 100%
rename from crypt/liboqs/ds_benchmark.h
rename to crypto/liboqs/ds_benchmark.h
diff --git a/crypt/liboqs/kex/Makefile.am b/crypto/liboqs/kex/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex/Makefile.am
rename to crypto/liboqs/kex/Makefile.am
diff --git a/crypt/liboqs/kex/kex.c b/crypto/liboqs/kex/kex.c
similarity index 100%
rename from crypt/liboqs/kex/kex.c
rename to crypto/liboqs/kex/kex.c
diff --git a/crypt/liboqs/kex/kex.h b/crypto/liboqs/kex/kex.h
similarity index 100%
rename from crypt/liboqs/kex/kex.h
rename to crypto/liboqs/kex/kex.h
diff --git a/crypt/liboqs/kex/test_kex.c b/crypto/liboqs/kex/test_kex.c
similarity index 100%
rename from crypt/liboqs/kex/test_kex.c
rename to crypto/liboqs/kex/test_kex.c
diff --git a/crypt/liboqs/kex_code_mcbits/LICENSE.txt b/crypto/liboqs/kex_code_mcbits/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/LICENSE.txt
rename to crypto/liboqs/kex_code_mcbits/LICENSE.txt
diff --git a/crypt/liboqs/kex_code_mcbits/Makefile.am b/crypto/liboqs/kex_code_mcbits/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/Makefile.am
rename to crypto/liboqs/kex_code_mcbits/Makefile.am
diff --git a/crypt/liboqs/kex_code_mcbits/external/api.h b/crypto/liboqs/kex_code_mcbits/external/api.h
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/api.h
rename to crypto/liboqs/kex_code_mcbits/external/api.h
diff --git a/crypt/liboqs/kex_code_mcbits/external/benes.c b/crypto/liboqs/kex_code_mcbits/external/benes.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/benes.c
rename to crypto/liboqs/kex_code_mcbits/external/benes.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/bm.c b/crypto/liboqs/kex_code_mcbits/external/bm.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/bm.c
rename to crypto/liboqs/kex_code_mcbits/external/bm.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/consts.data b/crypto/liboqs/kex_code_mcbits/external/consts.data
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/consts.data
rename to crypto/liboqs/kex_code_mcbits/external/consts.data
diff --git a/crypt/liboqs/kex_code_mcbits/external/decrypt.c b/crypto/liboqs/kex_code_mcbits/external/decrypt.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/decrypt.c
rename to crypto/liboqs/kex_code_mcbits/external/decrypt.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/encrypt.c b/crypto/liboqs/kex_code_mcbits/external/encrypt.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/encrypt.c
rename to crypto/liboqs/kex_code_mcbits/external/encrypt.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/fft.c b/crypto/liboqs/kex_code_mcbits/external/fft.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/fft.c
rename to crypto/liboqs/kex_code_mcbits/external/fft.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/fft_tr.c b/crypto/liboqs/kex_code_mcbits/external/fft_tr.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/fft_tr.c
rename to crypto/liboqs/kex_code_mcbits/external/fft_tr.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/gf.c b/crypto/liboqs/kex_code_mcbits/external/gf.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/gf.c
rename to crypto/liboqs/kex_code_mcbits/external/gf.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/implementors b/crypto/liboqs/kex_code_mcbits/external/implementors
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/implementors
rename to crypto/liboqs/kex_code_mcbits/external/implementors
diff --git a/crypt/liboqs/kex_code_mcbits/external/operations.c b/crypto/liboqs/kex_code_mcbits/external/operations.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/operations.c
rename to crypto/liboqs/kex_code_mcbits/external/operations.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/params.h b/crypto/liboqs/kex_code_mcbits/external/params.h
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/params.h
rename to crypto/liboqs/kex_code_mcbits/external/params.h
diff --git a/crypt/liboqs/kex_code_mcbits/external/pk_gen.c b/crypto/liboqs/kex_code_mcbits/external/pk_gen.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/pk_gen.c
rename to crypto/liboqs/kex_code_mcbits/external/pk_gen.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/points.data b/crypto/liboqs/kex_code_mcbits/external/points.data
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/points.data
rename to crypto/liboqs/kex_code_mcbits/external/points.data
diff --git a/crypt/liboqs/kex_code_mcbits/external/scalars.data b/crypto/liboqs/kex_code_mcbits/external/scalars.data
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/scalars.data
rename to crypto/liboqs/kex_code_mcbits/external/scalars.data
diff --git a/crypt/liboqs/kex_code_mcbits/external/scalars_2x.data b/crypto/liboqs/kex_code_mcbits/external/scalars_2x.data
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/scalars_2x.data
rename to crypto/liboqs/kex_code_mcbits/external/scalars_2x.data
diff --git a/crypt/liboqs/kex_code_mcbits/external/sk_gen.c b/crypto/liboqs/kex_code_mcbits/external/sk_gen.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/sk_gen.c
rename to crypto/liboqs/kex_code_mcbits/external/sk_gen.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/transpose.c b/crypto/liboqs/kex_code_mcbits/external/transpose.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/transpose.c
rename to crypto/liboqs/kex_code_mcbits/external/transpose.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/util.c b/crypto/liboqs/kex_code_mcbits/external/util.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/util.c
rename to crypto/liboqs/kex_code_mcbits/external/util.c
diff --git a/crypt/liboqs/kex_code_mcbits/external/vec.c b/crypto/liboqs/kex_code_mcbits/external/vec.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/external/vec.c
rename to crypto/liboqs/kex_code_mcbits/external/vec.c
diff --git a/crypt/liboqs/kex_code_mcbits/kex_code_mcbits.c b/crypto/liboqs/kex_code_mcbits/kex_code_mcbits.c
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/kex_code_mcbits.c
rename to crypto/liboqs/kex_code_mcbits/kex_code_mcbits.c
diff --git a/crypt/liboqs/kex_code_mcbits/kex_code_mcbits.h b/crypto/liboqs/kex_code_mcbits/kex_code_mcbits.h
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/kex_code_mcbits.h
rename to crypto/liboqs/kex_code_mcbits/kex_code_mcbits.h
diff --git a/crypt/liboqs/kex_code_mcbits/mcbits.h b/crypto/liboqs/kex_code_mcbits/mcbits.h
similarity index 100%
rename from crypt/liboqs/kex_code_mcbits/mcbits.h
rename to crypto/liboqs/kex_code_mcbits/mcbits.h
diff --git a/crypt/liboqs/kex_lwe_frodo/Makefile.am b/crypto/liboqs/kex_lwe_frodo/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/Makefile.am
rename to crypto/liboqs/kex_lwe_frodo/Makefile.am
diff --git a/crypt/liboqs/kex_lwe_frodo/kex_lwe_frodo.c b/crypto/liboqs/kex_lwe_frodo/kex_lwe_frodo.c
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/kex_lwe_frodo.c
rename to crypto/liboqs/kex_lwe_frodo/kex_lwe_frodo.c
diff --git a/crypt/liboqs/kex_lwe_frodo/kex_lwe_frodo.h b/crypto/liboqs/kex_lwe_frodo/kex_lwe_frodo.h
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/kex_lwe_frodo.h
rename to crypto/liboqs/kex_lwe_frodo/kex_lwe_frodo.h
diff --git a/crypt/liboqs/kex_lwe_frodo/kex_lwe_frodo_macrify.c b/crypto/liboqs/kex_lwe_frodo/kex_lwe_frodo_macrify.c
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/kex_lwe_frodo_macrify.c
rename to crypto/liboqs/kex_lwe_frodo/kex_lwe_frodo_macrify.c
diff --git a/crypt/liboqs/kex_lwe_frodo/local.h b/crypto/liboqs/kex_lwe_frodo/local.h
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/local.h
rename to crypto/liboqs/kex_lwe_frodo/local.h
diff --git a/crypt/liboqs/kex_lwe_frodo/lwe.c b/crypto/liboqs/kex_lwe_frodo/lwe.c
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/lwe.c
rename to crypto/liboqs/kex_lwe_frodo/lwe.c
diff --git a/crypt/liboqs/kex_lwe_frodo/lwe_macrify.c b/crypto/liboqs/kex_lwe_frodo/lwe_macrify.c
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/lwe_macrify.c
rename to crypto/liboqs/kex_lwe_frodo/lwe_macrify.c
diff --git a/crypt/liboqs/kex_lwe_frodo/lwe_noise.c b/crypto/liboqs/kex_lwe_frodo/lwe_noise.c
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/lwe_noise.c
rename to crypto/liboqs/kex_lwe_frodo/lwe_noise.c
diff --git a/crypt/liboqs/kex_lwe_frodo/recommended.h b/crypto/liboqs/kex_lwe_frodo/recommended.h
similarity index 100%
rename from crypt/liboqs/kex_lwe_frodo/recommended.h
rename to crypto/liboqs/kex_lwe_frodo/recommended.h
diff --git a/crypt/liboqs/kex_mlwe_kyber/LICENSE.txt b/crypto/liboqs/kex_mlwe_kyber/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/LICENSE.txt
rename to crypto/liboqs/kex_mlwe_kyber/LICENSE.txt
diff --git a/crypt/liboqs/kex_mlwe_kyber/Makefile.am b/crypto/liboqs/kex_mlwe_kyber/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/Makefile.am
rename to crypto/liboqs/kex_mlwe_kyber/Makefile.am
diff --git a/crypt/liboqs/kex_mlwe_kyber/indcpa.c b/crypto/liboqs/kex_mlwe_kyber/indcpa.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/indcpa.c
rename to crypto/liboqs/kex_mlwe_kyber/indcpa.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.c b/crypto/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.c
rename to crypto/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.h b/crypto/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.h
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.h
rename to crypto/liboqs/kex_mlwe_kyber/kex_mlwe_kyber.h
diff --git a/crypt/liboqs/kex_mlwe_kyber/kyber.c b/crypto/liboqs/kex_mlwe_kyber/kyber.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/kyber.c
rename to crypto/liboqs/kex_mlwe_kyber/kyber.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/ntt.c b/crypto/liboqs/kex_mlwe_kyber/ntt.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/ntt.c
rename to crypto/liboqs/kex_mlwe_kyber/ntt.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/params.h b/crypto/liboqs/kex_mlwe_kyber/params.h
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/params.h
rename to crypto/liboqs/kex_mlwe_kyber/params.h
diff --git a/crypt/liboqs/kex_mlwe_kyber/poly.c b/crypto/liboqs/kex_mlwe_kyber/poly.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/poly.c
rename to crypto/liboqs/kex_mlwe_kyber/poly.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/polyvec.c b/crypto/liboqs/kex_mlwe_kyber/polyvec.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/polyvec.c
rename to crypto/liboqs/kex_mlwe_kyber/polyvec.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/precomp.c b/crypto/liboqs/kex_mlwe_kyber/precomp.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/precomp.c
rename to crypto/liboqs/kex_mlwe_kyber/precomp.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/reduce.c b/crypto/liboqs/kex_mlwe_kyber/reduce.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/reduce.c
rename to crypto/liboqs/kex_mlwe_kyber/reduce.c
diff --git a/crypt/liboqs/kex_mlwe_kyber/verify.c b/crypto/liboqs/kex_mlwe_kyber/verify.c
similarity index 100%
rename from crypt/liboqs/kex_mlwe_kyber/verify.c
rename to crypto/liboqs/kex_mlwe_kyber/verify.c
diff --git a/crypt/liboqs/kex_ntru/Makefile.am b/crypto/liboqs/kex_ntru/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_ntru/Makefile.am
rename to crypto/liboqs/kex_ntru/Makefile.am
diff --git a/crypt/liboqs/kex_ntru/kex_ntru.c b/crypto/liboqs/kex_ntru/kex_ntru.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/kex_ntru.c
rename to crypto/liboqs/kex_ntru/kex_ntru.c
diff --git a/crypt/liboqs/kex_ntru/kex_ntru.h b/crypto/liboqs/kex_ntru/kex_ntru.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/kex_ntru.h
rename to crypto/liboqs/kex_ntru/kex_ntru.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto.h b/crypto/liboqs/kex_ntru/ntru_crypto.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto.h
rename to crypto/liboqs/kex_ntru/ntru_crypto.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_drbg.c b/crypto/liboqs/kex_ntru/ntru_crypto_drbg.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_drbg.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_drbg.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_drbg.h b/crypto/liboqs/kex_ntru/ntru_crypto_drbg.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_drbg.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_drbg.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_error.h b/crypto/liboqs/kex_ntru/ntru_crypto_error.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_error.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_error.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_hash.c b/crypto/liboqs/kex_ntru/ntru_crypto_hash.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_hash.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_hash.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_hash.h b/crypto/liboqs/kex_ntru/ntru_crypto_hash.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_hash.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_hash.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_hash_basics.h b/crypto/liboqs/kex_ntru/ntru_crypto_hash_basics.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_hash_basics.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_hash_basics.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_hmac.c b/crypto/liboqs/kex_ntru/ntru_crypto_hmac.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_hmac.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_hmac.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_hmac.h b/crypto/liboqs/kex_ntru/ntru_crypto_hmac.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_hmac.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_hmac.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.c b/crypto/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.h b/crypto/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_msbyte_uint32.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_convert.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_convert.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_convert.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_convert.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_convert.h b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_convert.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_convert.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_convert.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.h b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_key.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.h b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_encrypt_param_sets.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.h b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mgf1.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_karat.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_karat.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_karat.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_karat.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_simd.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_simd.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_simd.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_coeffs_simd.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_32.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_32.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_32.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_32.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_64.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_64.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_64.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_64.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_simd.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_simd.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_simd.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_mult_indices_simd.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_poly.c b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_poly.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_poly.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_poly.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_ntru_poly.h b/crypto/liboqs/kex_ntru/ntru_crypto_ntru_poly.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_ntru_poly.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_ntru_poly.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_platform.h b/crypto/liboqs/kex_ntru/ntru_crypto_platform.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_platform.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_platform.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha.h b/crypto/liboqs/kex_ntru/ntru_crypto_sha.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha1.c b/crypto/liboqs/kex_ntru/ntru_crypto_sha1.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha1.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha1.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha1.h b/crypto/liboqs/kex_ntru/ntru_crypto_sha1.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha1.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha1.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha2.c b/crypto/liboqs/kex_ntru/ntru_crypto_sha2.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha2.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha2.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha2.h b/crypto/liboqs/kex_ntru/ntru_crypto_sha2.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha2.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha2.h
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha256.c b/crypto/liboqs/kex_ntru/ntru_crypto_sha256.c
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha256.c
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha256.c
diff --git a/crypt/liboqs/kex_ntru/ntru_crypto_sha256.h b/crypto/liboqs/kex_ntru/ntru_crypto_sha256.h
similarity index 100%
rename from crypt/liboqs/kex_ntru/ntru_crypto_sha256.h
rename to crypto/liboqs/kex_ntru/ntru_crypto_sha256.h
diff --git a/crypt/liboqs/kex_rlwe_bcns15/LICENSE.txt b/crypto/liboqs/kex_rlwe_bcns15/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/LICENSE.txt
rename to crypto/liboqs/kex_rlwe_bcns15/LICENSE.txt
diff --git a/crypt/liboqs/kex_rlwe_bcns15/Makefile.am b/crypto/liboqs/kex_rlwe_bcns15/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/Makefile.am
rename to crypto/liboqs/kex_rlwe_bcns15/Makefile.am
diff --git a/crypt/liboqs/kex_rlwe_bcns15/fft.c b/crypto/liboqs/kex_rlwe_bcns15/fft.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/fft.c
rename to crypto/liboqs/kex_rlwe_bcns15/fft.c
diff --git a/crypt/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.c b/crypto/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.c
rename to crypto/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.c
diff --git a/crypt/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.h b/crypto/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.h
rename to crypto/liboqs/kex_rlwe_bcns15/kex_rlwe_bcns15.h
diff --git a/crypt/liboqs/kex_rlwe_bcns15/local.h b/crypto/liboqs/kex_rlwe_bcns15/local.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/local.h
rename to crypto/liboqs/kex_rlwe_bcns15/local.h
diff --git a/crypt/liboqs/kex_rlwe_bcns15/rlwe.c b/crypto/liboqs/kex_rlwe_bcns15/rlwe.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/rlwe.c
rename to crypto/liboqs/kex_rlwe_bcns15/rlwe.c
diff --git a/crypt/liboqs/kex_rlwe_bcns15/rlwe_a.h b/crypto/liboqs/kex_rlwe_bcns15/rlwe_a.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/rlwe_a.h
rename to crypto/liboqs/kex_rlwe_bcns15/rlwe_a.h
diff --git a/crypt/liboqs/kex_rlwe_bcns15/rlwe_kex.c b/crypto/liboqs/kex_rlwe_bcns15/rlwe_kex.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/rlwe_kex.c
rename to crypto/liboqs/kex_rlwe_bcns15/rlwe_kex.c
diff --git a/crypt/liboqs/kex_rlwe_bcns15/rlwe_table.h b/crypto/liboqs/kex_rlwe_bcns15/rlwe_table.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_bcns15/rlwe_table.h
rename to crypto/liboqs/kex_rlwe_bcns15/rlwe_table.h
diff --git a/crypt/liboqs/kex_rlwe_msrln16/AMD64/consts.c b/crypto/liboqs/kex_rlwe_msrln16/AMD64/consts.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/AMD64/consts.c
rename to crypto/liboqs/kex_rlwe_msrln16/AMD64/consts.c
diff --git a/crypt/liboqs/kex_rlwe_msrln16/AMD64/error_asm.S b/crypto/liboqs/kex_rlwe_msrln16/AMD64/error_asm.S
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/AMD64/error_asm.S
rename to crypto/liboqs/kex_rlwe_msrln16/AMD64/error_asm.S
diff --git a/crypt/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64.c b/crypto/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64.c
rename to crypto/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64.c
diff --git a/crypt/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64_asm.S b/crypto/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64_asm.S
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64_asm.S
rename to crypto/liboqs/kex_rlwe_msrln16/AMD64/ntt_x64_asm.S
diff --git a/crypt/liboqs/kex_rlwe_msrln16/LICENSE.txt b/crypto/liboqs/kex_rlwe_msrln16/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/LICENSE.txt
rename to crypto/liboqs/kex_rlwe_msrln16/LICENSE.txt
diff --git a/crypt/liboqs/kex_rlwe_msrln16/LatticeCrypto.h b/crypto/liboqs/kex_rlwe_msrln16/LatticeCrypto.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/LatticeCrypto.h
rename to crypto/liboqs/kex_rlwe_msrln16/LatticeCrypto.h
diff --git a/crypt/liboqs/kex_rlwe_msrln16/LatticeCrypto_kex.c b/crypto/liboqs/kex_rlwe_msrln16/LatticeCrypto_kex.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/LatticeCrypto_kex.c
rename to crypto/liboqs/kex_rlwe_msrln16/LatticeCrypto_kex.c
diff --git a/crypt/liboqs/kex_rlwe_msrln16/LatticeCrypto_priv.h b/crypto/liboqs/kex_rlwe_msrln16/LatticeCrypto_priv.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/LatticeCrypto_priv.h
rename to crypto/liboqs/kex_rlwe_msrln16/LatticeCrypto_priv.h
diff --git a/crypt/liboqs/kex_rlwe_msrln16/Makefile.am b/crypto/liboqs/kex_rlwe_msrln16/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/Makefile.am
rename to crypto/liboqs/kex_rlwe_msrln16/Makefile.am
diff --git a/crypt/liboqs/kex_rlwe_msrln16/README.txt b/crypto/liboqs/kex_rlwe_msrln16/README.txt
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/README.txt
rename to crypto/liboqs/kex_rlwe_msrln16/README.txt
diff --git a/crypt/liboqs/kex_rlwe_msrln16/generic/ntt.c b/crypto/liboqs/kex_rlwe_msrln16/generic/ntt.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/generic/ntt.c
rename to crypto/liboqs/kex_rlwe_msrln16/generic/ntt.c
diff --git a/crypt/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.c b/crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.c
rename to crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.c
diff --git a/crypt/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h b/crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h
rename to crypto/liboqs/kex_rlwe_msrln16/kex_rlwe_msrln16.h
diff --git a/crypt/liboqs/kex_rlwe_msrln16/ntt_constants.c b/crypto/liboqs/kex_rlwe_msrln16/ntt_constants.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_msrln16/ntt_constants.c
rename to crypto/liboqs/kex_rlwe_msrln16/ntt_constants.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/LICENSE.txt b/crypto/liboqs/kex_rlwe_newhope/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/LICENSE.txt
rename to crypto/liboqs/kex_rlwe_newhope/LICENSE.txt
diff --git a/crypt/liboqs/kex_rlwe_newhope/Makefile.am b/crypto/liboqs/kex_rlwe_newhope/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/Makefile.am
rename to crypto/liboqs/kex_rlwe_newhope/Makefile.am
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/Makefile.am b/crypto/liboqs/kex_rlwe_newhope/avx2/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/Makefile.am
rename to crypto/liboqs/kex_rlwe_newhope/avx2/Makefile.am
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/bitrev.s b/crypto/liboqs/kex_rlwe_newhope/avx2/bitrev.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/bitrev.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/bitrev.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/cbd.s b/crypto/liboqs/kex_rlwe_newhope/avx2/cbd.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/cbd.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/cbd.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/chacha.S b/crypto/liboqs/kex_rlwe_newhope/avx2/chacha.S
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/chacha.S
rename to crypto/liboqs/kex_rlwe_newhope/avx2/chacha.S
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/consts.c b/crypto/liboqs/kex_rlwe_newhope/avx2/consts.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/consts.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/consts.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/cpucycles.c b/crypto/liboqs/kex_rlwe_newhope/avx2/cpucycles.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/cpucycles.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/cpucycles.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/cpucycles.h b/crypto/liboqs/kex_rlwe_newhope/avx2/cpucycles.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/cpucycles.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/cpucycles.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.c b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.h b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_hash_sha256.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream.h b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.c b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.h b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.s b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_aes256ctr.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.c b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.h b/crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/crypto_stream_chacha20.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/error_correction.c b/crypto/liboqs/kex_rlwe_newhope/avx2/error_correction.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/error_correction.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/error_correction.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/error_correction.h b/crypto/liboqs/kex_rlwe_newhope/avx2/error_correction.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/error_correction.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/error_correction.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/fips202.c b/crypto/liboqs/kex_rlwe_newhope/avx2/fips202.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/fips202.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/fips202.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/fips202.h b/crypto/liboqs/kex_rlwe_newhope/avx2/fips202.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/fips202.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/fips202.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/hr.s b/crypto/liboqs/kex_rlwe_newhope/avx2/hr.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/hr.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/hr.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/newhope.c b/crypto/liboqs/kex_rlwe_newhope/avx2/newhope.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/newhope.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/newhope.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/newhope.h b/crypto/liboqs/kex_rlwe_newhope/avx2/newhope.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/newhope.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/newhope.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/ntt.h b/crypto/liboqs/kex_rlwe_newhope/avx2/ntt.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/ntt.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/ntt.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/ntt_double.s b/crypto/liboqs/kex_rlwe_newhope/avx2/ntt_double.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/ntt_double.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/ntt_double.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/omegas.c b/crypto/liboqs/kex_rlwe_newhope/avx2/omegas.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/omegas.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/omegas.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/params.h b/crypto/liboqs/kex_rlwe_newhope/avx2/params.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/params.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/params.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/poly.c b/crypto/liboqs/kex_rlwe_newhope/avx2/poly.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/poly.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/poly.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/poly.h b/crypto/liboqs/kex_rlwe_newhope/avx2/poly.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/poly.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/poly.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/poly_pointwise.s b/crypto/liboqs/kex_rlwe_newhope/avx2/poly_pointwise.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/poly_pointwise.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/poly_pointwise.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/precomp.c b/crypto/liboqs/kex_rlwe_newhope/avx2/precomp.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/precomp.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/precomp.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/randombytes.c b/crypto/liboqs/kex_rlwe_newhope/avx2/randombytes.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/randombytes.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/randombytes.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/randombytes.h b/crypto/liboqs/kex_rlwe_newhope/avx2/randombytes.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/randombytes.h
rename to crypto/liboqs/kex_rlwe_newhope/avx2/randombytes.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/rec.s b/crypto/liboqs/kex_rlwe_newhope/avx2/rec.s
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/rec.s
rename to crypto/liboqs/kex_rlwe_newhope/avx2/rec.s
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/test/speed.c b/crypto/liboqs/kex_rlwe_newhope/avx2/test/speed.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/test/speed.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/test/speed.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/test/test_newhope.c b/crypto/liboqs/kex_rlwe_newhope/avx2/test/test_newhope.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/test/test_newhope.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/test/test_newhope.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/test/test_statistical.c b/crypto/liboqs/kex_rlwe_newhope/avx2/test/test_statistical.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/test/test_statistical.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/test/test_statistical.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/avx2/test/testvectors.c b/crypto/liboqs/kex_rlwe_newhope/avx2/test/testvectors.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/avx2/test/testvectors.c
rename to crypto/liboqs/kex_rlwe_newhope/avx2/test/testvectors.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.c b/crypto/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.c
rename to crypto/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.h b/crypto/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.h
rename to crypto/liboqs/kex_rlwe_newhope/kex_rlwe_newhope.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/newhope.c b/crypto/liboqs/kex_rlwe_newhope/newhope.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/newhope.c
rename to crypto/liboqs/kex_rlwe_newhope/newhope.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/params.h b/crypto/liboqs/kex_rlwe_newhope/params.h
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/params.h
rename to crypto/liboqs/kex_rlwe_newhope/params.h
diff --git a/crypt/liboqs/kex_rlwe_newhope/poly.c b/crypto/liboqs/kex_rlwe_newhope/poly.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/poly.c
rename to crypto/liboqs/kex_rlwe_newhope/poly.c
diff --git a/crypt/liboqs/kex_rlwe_newhope/precomp.c b/crypto/liboqs/kex_rlwe_newhope/precomp.c
similarity index 100%
rename from crypt/liboqs/kex_rlwe_newhope/precomp.c
rename to crypto/liboqs/kex_rlwe_newhope/precomp.c
diff --git a/crypt/liboqs/kex_sidh_cln16/AMD64/fp_x64.c b/crypto/liboqs/kex_sidh_cln16/AMD64/fp_x64.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/AMD64/fp_x64.c
rename to crypto/liboqs/kex_sidh_cln16/AMD64/fp_x64.c
diff --git a/crypt/liboqs/kex_sidh_cln16/AMD64/fp_x64_asm.S b/crypto/liboqs/kex_sidh_cln16/AMD64/fp_x64_asm.S
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/AMD64/fp_x64_asm.S
rename to crypto/liboqs/kex_sidh_cln16/AMD64/fp_x64_asm.S
diff --git a/crypt/liboqs/kex_sidh_cln16/ARM64/fp_arm64.c b/crypto/liboqs/kex_sidh_cln16/ARM64/fp_arm64.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/ARM64/fp_arm64.c
rename to crypto/liboqs/kex_sidh_cln16/ARM64/fp_arm64.c
diff --git a/crypt/liboqs/kex_sidh_cln16/ARM64/fp_arm64_asm.S b/crypto/liboqs/kex_sidh_cln16/ARM64/fp_arm64_asm.S
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/ARM64/fp_arm64_asm.S
rename to crypto/liboqs/kex_sidh_cln16/ARM64/fp_arm64_asm.S
diff --git a/crypt/liboqs/kex_sidh_cln16/LICENSE.txt b/crypto/liboqs/kex_sidh_cln16/LICENSE.txt
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/LICENSE.txt
rename to crypto/liboqs/kex_sidh_cln16/LICENSE.txt
diff --git a/crypt/liboqs/kex_sidh_cln16/Makefile.am b/crypto/liboqs/kex_sidh_cln16/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/Makefile.am
rename to crypto/liboqs/kex_sidh_cln16/Makefile.am
diff --git a/crypt/liboqs/kex_sidh_cln16/README.txt b/crypto/liboqs/kex_sidh_cln16/README.txt
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/README.txt
rename to crypto/liboqs/kex_sidh_cln16/README.txt
diff --git a/crypt/liboqs/kex_sidh_cln16/SIDH.c b/crypto/liboqs/kex_sidh_cln16/SIDH.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/SIDH.c
rename to crypto/liboqs/kex_sidh_cln16/SIDH.c
diff --git a/crypt/liboqs/kex_sidh_cln16/SIDH.h b/crypto/liboqs/kex_sidh_cln16/SIDH.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/SIDH.h
rename to crypto/liboqs/kex_sidh_cln16/SIDH.h
diff --git a/crypt/liboqs/kex_sidh_cln16/SIDH_internal.h b/crypto/liboqs/kex_sidh_cln16/SIDH_internal.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/SIDH_internal.h
rename to crypto/liboqs/kex_sidh_cln16/SIDH_internal.h
diff --git a/crypt/liboqs/kex_sidh_cln16/SIDH_setup.c b/crypto/liboqs/kex_sidh_cln16/SIDH_setup.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/SIDH_setup.c
rename to crypto/liboqs/kex_sidh_cln16/SIDH_setup.c
diff --git a/crypt/liboqs/kex_sidh_cln16/ec_isogeny.c b/crypto/liboqs/kex_sidh_cln16/ec_isogeny.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/ec_isogeny.c
rename to crypto/liboqs/kex_sidh_cln16/ec_isogeny.c
diff --git a/crypt/liboqs/kex_sidh_cln16/fpx.c b/crypto/liboqs/kex_sidh_cln16/fpx.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/fpx.c
rename to crypto/liboqs/kex_sidh_cln16/fpx.c
diff --git a/crypt/liboqs/kex_sidh_cln16/generic/fp_generic.c b/crypto/liboqs/kex_sidh_cln16/generic/fp_generic.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/generic/fp_generic.c
rename to crypto/liboqs/kex_sidh_cln16/generic/fp_generic.c
diff --git a/crypt/liboqs/kex_sidh_cln16/kex_sidh_cln16.c b/crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/kex_sidh_cln16.c
rename to crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.c
diff --git a/crypt/liboqs/kex_sidh_cln16/kex_sidh_cln16.h b/crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/kex_sidh_cln16.h
rename to crypto/liboqs/kex_sidh_cln16/kex_sidh_cln16.h
diff --git a/crypt/liboqs/kex_sidh_cln16/sidh_kex.c b/crypto/liboqs/kex_sidh_cln16/sidh_kex.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_cln16/sidh_kex.c
rename to crypto/liboqs/kex_sidh_cln16/sidh_kex.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/Makefile.am b/crypto/liboqs/kex_sidh_iqc_ref/Makefile.am
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/Makefile.am
rename to crypto/liboqs/kex_sidh_iqc_ref/Makefile.am
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.c b/crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.c
rename to crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h b/crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h
rename to crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.c b/crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.c
rename to crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.h b/crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.h
rename to crypto/liboqs/kex_sidh_iqc_ref/kex_sidh_iqc_ref_params.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_elliptic_curve_dlp.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_isogeny.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_isogeny.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_isogeny.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_isogeny.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_isogeny.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_isogeny.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_isogeny.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_isogeny.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_private_key.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_private_key.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_private_key.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_private_key.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_private_key.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_private_key.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_private_key.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_private_key.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_encryption.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_key_validation.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_param.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_param.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_param.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_param.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_public_param.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_public_param.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_public_param.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_public_param.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_quadratic_ext.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_shared_key.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_shared_key.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_shared_key.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_shared_key.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_shared_key.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_shared_key.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_shared_key.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_shared_key.h
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_util.c b/crypto/liboqs/kex_sidh_iqc_ref/sidh_util.c
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_util.c
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_util.c
diff --git a/crypt/liboqs/kex_sidh_iqc_ref/sidh_util.h b/crypto/liboqs/kex_sidh_iqc_ref/sidh_util.h
similarity index 100%
rename from crypt/liboqs/kex_sidh_iqc_ref/sidh_util.h
rename to crypto/liboqs/kex_sidh_iqc_ref/sidh_util.h
diff --git a/crypt/liboqs/sig/Makefile.am b/crypto/liboqs/sig/Makefile.am
similarity index 100%
rename from crypt/liboqs/sig/Makefile.am
rename to crypto/liboqs/sig/Makefile.am
diff --git a/crypt/liboqs/sig/sig.c b/crypto/liboqs/sig/sig.c
similarity index 100%
rename from crypt/liboqs/sig/sig.c
rename to crypto/liboqs/sig/sig.c
diff --git a/crypt/liboqs/sig/sig.h b/crypto/liboqs/sig/sig.h
similarity index 100%
rename from crypt/liboqs/sig/sig.h
rename to crypto/liboqs/sig/sig.h
diff --git a/crypt/liboqs/sig/test_sig.c b/crypto/liboqs/sig/test_sig.c
similarity index 100%
rename from crypt/liboqs/sig/test_sig.c
rename to crypto/liboqs/sig/test_sig.c
diff --git a/crypt/liboqs/sig_picnic/Makefile.am b/crypto/liboqs/sig_picnic/Makefile.am
similarity index 100%
rename from crypt/liboqs/sig_picnic/Makefile.am
rename to crypto/liboqs/sig_picnic/Makefile.am
diff --git a/crypt/liboqs/sig_picnic/build_picnic.sh b/crypto/liboqs/sig_picnic/build_picnic.sh
similarity index 100%
rename from crypt/liboqs/sig_picnic/build_picnic.sh
rename to crypto/liboqs/sig_picnic/build_picnic.sh
diff --git a/crypt/liboqs/sig_picnic/oqs_sig_picnic.patch b/crypto/liboqs/sig_picnic/oqs_sig_picnic.patch
similarity index 100%
rename from crypt/liboqs/sig_picnic/oqs_sig_picnic.patch
rename to crypto/liboqs/sig_picnic/oqs_sig_picnic.patch
diff --git a/crypt/liboqs/sig_picnic/sig_picnic.c b/crypto/liboqs/sig_picnic/sig_picnic.c
similarity index 100%
rename from crypt/liboqs/sig_picnic/sig_picnic.c
rename to crypto/liboqs/sig_picnic/sig_picnic.c
diff --git a/crypt/liboqs/sig_picnic/sig_picnic.h b/crypto/liboqs/sig_picnic/sig_picnic.h
similarity index 100%
rename from crypt/liboqs/sig_picnic/sig_picnic.h
rename to crypto/liboqs/sig_picnic/sig_picnic.h
diff --git a/crypt/sig_picnic/.clang-format b/crypto/sig_picnic/.clang-format
similarity index 100%
rename from crypt/sig_picnic/.clang-format
rename to crypto/sig_picnic/.clang-format
diff --git a/crypt/sig_picnic/.gitignore b/crypto/sig_picnic/.gitignore
similarity index 100%
rename from crypt/sig_picnic/.gitignore
rename to crypto/sig_picnic/.gitignore
diff --git a/crypt/sig_picnic/.travis-build.sh b/crypto/sig_picnic/.travis-build.sh
similarity index 100%
rename from crypt/sig_picnic/.travis-build.sh
rename to crypto/sig_picnic/.travis-build.sh
diff --git a/crypt/sig_picnic/.travis-script.sh b/crypto/sig_picnic/.travis-script.sh
similarity index 100%
rename from crypt/sig_picnic/.travis-script.sh
rename to crypto/sig_picnic/.travis-script.sh
diff --git a/crypt/sig_picnic/.travis.yml b/crypto/sig_picnic/.travis.yml
similarity index 100%
rename from crypt/sig_picnic/.travis.yml
rename to crypto/sig_picnic/.travis.yml
diff --git a/crypt/sig_picnic/AUTHORS b/crypto/sig_picnic/AUTHORS
similarity index 100%
rename from crypt/sig_picnic/AUTHORS
rename to crypto/sig_picnic/AUTHORS
diff --git a/crypt/sig_picnic/CMakeLists.txt b/crypto/sig_picnic/CMakeLists.txt
similarity index 100%
rename from crypt/sig_picnic/CMakeLists.txt
rename to crypto/sig_picnic/CMakeLists.txt
diff --git a/crypt/sig_picnic/L1_FS/api.h b/crypto/sig_picnic/L1_FS/api.h
similarity index 100%
rename from crypt/sig_picnic/L1_FS/api.h
rename to crypto/sig_picnic/L1_FS/api.h
diff --git a/crypt/sig_picnic/L1_FS/sign.c b/crypto/sig_picnic/L1_FS/sign.c
similarity index 100%
rename from crypt/sig_picnic/L1_FS/sign.c
rename to crypto/sig_picnic/L1_FS/sign.c
diff --git a/crypt/sig_picnic/L1_UR/api.h b/crypto/sig_picnic/L1_UR/api.h
similarity index 100%
rename from crypt/sig_picnic/L1_UR/api.h
rename to crypto/sig_picnic/L1_UR/api.h
diff --git a/crypt/sig_picnic/L1_UR/sign.c b/crypto/sig_picnic/L1_UR/sign.c
similarity index 100%
rename from crypt/sig_picnic/L1_UR/sign.c
rename to crypto/sig_picnic/L1_UR/sign.c
diff --git a/crypt/sig_picnic/L3_FS/api.h b/crypto/sig_picnic/L3_FS/api.h
similarity index 100%
rename from crypt/sig_picnic/L3_FS/api.h
rename to crypto/sig_picnic/L3_FS/api.h
diff --git a/crypt/sig_picnic/L3_FS/sign.c b/crypto/sig_picnic/L3_FS/sign.c
similarity index 100%
rename from crypt/sig_picnic/L3_FS/sign.c
rename to crypto/sig_picnic/L3_FS/sign.c
diff --git a/crypt/sig_picnic/L3_UR/api.h b/crypto/sig_picnic/L3_UR/api.h
similarity index 100%
rename from crypt/sig_picnic/L3_UR/api.h
rename to crypto/sig_picnic/L3_UR/api.h
diff --git a/crypt/sig_picnic/L3_UR/sign.c b/crypto/sig_picnic/L3_UR/sign.c
similarity index 100%
rename from crypt/sig_picnic/L3_UR/sign.c
rename to crypto/sig_picnic/L3_UR/sign.c
diff --git a/crypt/sig_picnic/L5_FS/api.h b/crypto/sig_picnic/L5_FS/api.h
similarity index 100%
rename from crypt/sig_picnic/L5_FS/api.h
rename to crypto/sig_picnic/L5_FS/api.h
diff --git a/crypt/sig_picnic/L5_FS/sign.c b/crypto/sig_picnic/L5_FS/sign.c
similarity index 100%
rename from crypt/sig_picnic/L5_FS/sign.c
rename to crypto/sig_picnic/L5_FS/sign.c
diff --git a/crypt/sig_picnic/L5_UR/api.h b/crypto/sig_picnic/L5_UR/api.h
similarity index 100%
rename from crypt/sig_picnic/L5_UR/api.h
rename to crypto/sig_picnic/L5_UR/api.h
diff --git a/crypt/sig_picnic/L5_UR/sign.c b/crypto/sig_picnic/L5_UR/sign.c
similarity index 100%
rename from crypt/sig_picnic/L5_UR/sign.c
rename to crypto/sig_picnic/L5_UR/sign.c
diff --git a/crypt/sig_picnic/LICENSE b/crypto/sig_picnic/LICENSE
similarity index 100%
rename from crypt/sig_picnic/LICENSE
rename to crypto/sig_picnic/LICENSE
diff --git a/crypt/sig_picnic/README.md b/crypto/sig_picnic/README.md
similarity index 100%
rename from crypt/sig_picnic/README.md
rename to crypto/sig_picnic/README.md
diff --git a/crypt/sig_picnic/aligned_alloc.c b/crypto/sig_picnic/aligned_alloc.c
similarity index 100%
rename from crypt/sig_picnic/aligned_alloc.c
rename to crypto/sig_picnic/aligned_alloc.c
diff --git a/crypt/sig_picnic/bitstream.c b/crypto/sig_picnic/bitstream.c
similarity index 100%
rename from crypt/sig_picnic/bitstream.c
rename to crypto/sig_picnic/bitstream.c
diff --git a/crypt/sig_picnic/bitstream.h b/crypto/sig_picnic/bitstream.h
similarity index 100%
rename from crypt/sig_picnic/bitstream.h
rename to crypto/sig_picnic/bitstream.h
diff --git a/crypt/sig_picnic/cmake/CheckSIMD.cmake b/crypto/sig_picnic/cmake/CheckSIMD.cmake
similarity index 100%
rename from crypt/sig_picnic/cmake/CheckSIMD.cmake
rename to crypto/sig_picnic/cmake/CheckSIMD.cmake
diff --git a/crypt/sig_picnic/cmake/Findm4ri.cmake b/crypto/sig_picnic/cmake/Findm4ri.cmake
similarity index 100%
rename from crypt/sig_picnic/cmake/Findm4ri.cmake
rename to crypto/sig_picnic/cmake/Findm4ri.cmake
diff --git a/crypt/sig_picnic/cmake/check-simd.c b/crypto/sig_picnic/cmake/check-simd.c
similarity index 100%
rename from crypt/sig_picnic/cmake/check-simd.c
rename to crypto/sig_picnic/cmake/check-simd.c
diff --git a/crypt/sig_picnic/compat.h b/crypto/sig_picnic/compat.h
similarity index 100%
rename from crypt/sig_picnic/compat.h
rename to crypto/sig_picnic/compat.h
diff --git a/crypt/sig_picnic/config.h.in b/crypto/sig_picnic/config.h.in
similarity index 100%
rename from crypt/sig_picnic/config.h.in
rename to crypto/sig_picnic/config.h.in
diff --git a/crypt/sig_picnic/cpu.c b/crypto/sig_picnic/cpu.c
similarity index 100%
rename from crypt/sig_picnic/cpu.c
rename to crypto/sig_picnic/cpu.c
diff --git a/crypt/sig_picnic/cpu.h b/crypto/sig_picnic/cpu.h
similarity index 100%
rename from crypt/sig_picnic/cpu.h
rename to crypto/sig_picnic/cpu.h
diff --git a/crypt/sig_picnic/crypto_sign.h b/crypto/sig_picnic/crypto_sign.h
similarity index 100%
rename from crypt/sig_picnic/crypto_sign.h
rename to crypto/sig_picnic/crypto_sign.h
diff --git a/crypt/sig_picnic/endian_compat.h b/crypto/sig_picnic/endian_compat.h
similarity index 100%
rename from crypt/sig_picnic/endian_compat.h
rename to crypto/sig_picnic/endian_compat.h
diff --git a/crypt/sig_picnic/io.c b/crypto/sig_picnic/io.c
similarity index 100%
rename from crypt/sig_picnic/io.c
rename to crypto/sig_picnic/io.c
diff --git a/crypt/sig_picnic/io.h b/crypto/sig_picnic/io.h
similarity index 100%
rename from crypt/sig_picnic/io.h
rename to crypto/sig_picnic/io.h
diff --git a/crypt/sig_picnic/kdf_shake.c b/crypto/sig_picnic/kdf_shake.c
similarity index 100%
rename from crypt/sig_picnic/kdf_shake.c
rename to crypto/sig_picnic/kdf_shake.c
diff --git a/crypt/sig_picnic/kdf_shake.h b/crypto/sig_picnic/kdf_shake.h
similarity index 100%
rename from crypt/sig_picnic/kdf_shake.h
rename to crypto/sig_picnic/kdf_shake.h
diff --git a/crypt/sig_picnic/lowmc.c b/crypto/sig_picnic/lowmc.c
similarity index 100%
rename from crypt/sig_picnic/lowmc.c
rename to crypto/sig_picnic/lowmc.c
diff --git a/crypt/sig_picnic/lowmc.h b/crypto/sig_picnic/lowmc.h
similarity index 100%
rename from crypt/sig_picnic/lowmc.h
rename to crypto/sig_picnic/lowmc.h
diff --git a/crypt/sig_picnic/lowmc_128_128_20.c b/crypto/sig_picnic/lowmc_128_128_20.c
similarity index 100%
rename from crypt/sig_picnic/lowmc_128_128_20.c
rename to crypto/sig_picnic/lowmc_128_128_20.c
diff --git a/crypt/sig_picnic/lowmc_128_128_20.h b/crypto/sig_picnic/lowmc_128_128_20.h
similarity index 100%
rename from crypt/sig_picnic/lowmc_128_128_20.h
rename to crypto/sig_picnic/lowmc_128_128_20.h
diff --git a/crypt/sig_picnic/lowmc_192_192_30.c b/crypto/sig_picnic/lowmc_192_192_30.c
similarity index 100%
rename from crypt/sig_picnic/lowmc_192_192_30.c
rename to crypto/sig_picnic/lowmc_192_192_30.c
diff --git a/crypt/sig_picnic/lowmc_192_192_30.h b/crypto/sig_picnic/lowmc_192_192_30.h
similarity index 100%
rename from crypt/sig_picnic/lowmc_192_192_30.h
rename to crypto/sig_picnic/lowmc_192_192_30.h
diff --git a/crypt/sig_picnic/lowmc_256_256_38.c b/crypto/sig_picnic/lowmc_256_256_38.c
similarity index 100%
rename from crypt/sig_picnic/lowmc_256_256_38.c
rename to crypto/sig_picnic/lowmc_256_256_38.c
diff --git a/crypt/sig_picnic/lowmc_256_256_38.h b/crypto/sig_picnic/lowmc_256_256_38.h
similarity index 100%
rename from crypt/sig_picnic/lowmc_256_256_38.h
rename to crypto/sig_picnic/lowmc_256_256_38.h
diff --git a/crypt/sig_picnic/lowmc_pars.c b/crypto/sig_picnic/lowmc_pars.c
similarity index 100%
rename from crypt/sig_picnic/lowmc_pars.c
rename to crypto/sig_picnic/lowmc_pars.c
diff --git a/crypt/sig_picnic/lowmc_pars.h b/crypto/sig_picnic/lowmc_pars.h
similarity index 100%
rename from crypt/sig_picnic/lowmc_pars.h
rename to crypto/sig_picnic/lowmc_pars.h
diff --git a/crypt/sig_picnic/macros.h b/crypto/sig_picnic/macros.h
similarity index 100%
rename from crypt/sig_picnic/macros.h
rename to crypto/sig_picnic/macros.h
diff --git a/crypt/sig_picnic/mpc.c b/crypto/sig_picnic/mpc.c
similarity index 100%
rename from crypt/sig_picnic/mpc.c
rename to crypto/sig_picnic/mpc.c
diff --git a/crypt/sig_picnic/mpc.h b/crypto/sig_picnic/mpc.h
similarity index 100%
rename from crypt/sig_picnic/mpc.h
rename to crypto/sig_picnic/mpc.h
diff --git a/crypt/sig_picnic/mpc_lowmc.c b/crypto/sig_picnic/mpc_lowmc.c
similarity index 100%
rename from crypt/sig_picnic/mpc_lowmc.c
rename to crypto/sig_picnic/mpc_lowmc.c
diff --git a/crypt/sig_picnic/mpc_lowmc.h b/crypto/sig_picnic/mpc_lowmc.h
similarity index 100%
rename from crypt/sig_picnic/mpc_lowmc.h
rename to crypto/sig_picnic/mpc_lowmc.h
diff --git a/crypt/sig_picnic/mzd_additional.c b/crypto/sig_picnic/mzd_additional.c
similarity index 100%
rename from crypt/sig_picnic/mzd_additional.c
rename to crypto/sig_picnic/mzd_additional.c
diff --git a/crypt/sig_picnic/mzd_additional.h b/crypto/sig_picnic/mzd_additional.h
similarity index 100%
rename from crypt/sig_picnic/mzd_additional.h
rename to crypto/sig_picnic/mzd_additional.h
diff --git a/crypt/sig_picnic/picnic.c b/crypto/sig_picnic/picnic.c
similarity index 100%
rename from crypt/sig_picnic/picnic.c
rename to crypto/sig_picnic/picnic.c
diff --git a/crypt/sig_picnic/picnic.h b/crypto/sig_picnic/picnic.h
similarity index 100%
rename from crypt/sig_picnic/picnic.h
rename to crypto/sig_picnic/picnic.h
diff --git a/crypt/sig_picnic/picnic_impl.c b/crypto/sig_picnic/picnic_impl.c
similarity index 100%
rename from crypt/sig_picnic/picnic_impl.c
rename to crypto/sig_picnic/picnic_impl.c
diff --git a/crypt/sig_picnic/picnic_impl.h b/crypto/sig_picnic/picnic_impl.h
similarity index 100%
rename from crypt/sig_picnic/picnic_impl.h
rename to crypto/sig_picnic/picnic_impl.h
diff --git a/crypt/sig_picnic/randomness.c b/crypto/sig_picnic/randomness.c
similarity index 100%
rename from crypt/sig_picnic/randomness.c
rename to crypto/sig_picnic/randomness.c
diff --git a/crypt/sig_picnic/randomness.h b/crypto/sig_picnic/randomness.h
similarity index 100%
rename from crypt/sig_picnic/randomness.h
rename to crypto/sig_picnic/randomness.h
diff --git a/crypt/sig_picnic/sha3/KeccakHash.c b/crypto/sig_picnic/sha3/KeccakHash.c
similarity index 100%
rename from crypt/sig_picnic/sha3/KeccakHash.c
rename to crypto/sig_picnic/sha3/KeccakHash.c
diff --git a/crypt/sig_picnic/sha3/KeccakHash.h b/crypto/sig_picnic/sha3/KeccakHash.h
similarity index 100%
rename from crypt/sig_picnic/sha3/KeccakHash.h
rename to crypto/sig_picnic/sha3/KeccakHash.h
diff --git a/crypt/sig_picnic/sha3/KeccakSponge.c b/crypto/sig_picnic/sha3/KeccakSponge.c
similarity index 100%
rename from crypt/sig_picnic/sha3/KeccakSponge.c
rename to crypto/sig_picnic/sha3/KeccakSponge.c
diff --git a/crypt/sig_picnic/sha3/KeccakSponge.h b/crypto/sig_picnic/sha3/KeccakSponge.h
similarity index 100%
rename from crypt/sig_picnic/sha3/KeccakSponge.h
rename to crypto/sig_picnic/sha3/KeccakSponge.h
diff --git a/crypt/sig_picnic/sha3/KeccakSponge.inc b/crypto/sig_picnic/sha3/KeccakSponge.inc
similarity index 100%
rename from crypt/sig_picnic/sha3/KeccakSponge.inc
rename to crypto/sig_picnic/sha3/KeccakSponge.inc
diff --git a/crypt/sig_picnic/sha3/Phases.h b/crypto/sig_picnic/sha3/Phases.h
similarity index 100%
rename from crypt/sig_picnic/sha3/Phases.h
rename to crypto/sig_picnic/sha3/Phases.h
diff --git a/crypt/sig_picnic/sha3/SnP-Relaned.h b/crypto/sig_picnic/sha3/SnP-Relaned.h
similarity index 100%
rename from crypt/sig_picnic/sha3/SnP-Relaned.h
rename to crypto/sig_picnic/sha3/SnP-Relaned.h
diff --git a/crypt/sig_picnic/sha3/align.h b/crypto/sig_picnic/sha3/align.h
similarity index 100%
rename from crypt/sig_picnic/sha3/align.h
rename to crypto/sig_picnic/sha3/align.h
diff --git a/crypt/sig_picnic/sha3/armv8a-neon/KeccakP-1600-SnP.h b/crypto/sig_picnic/sha3/armv8a-neon/KeccakP-1600-SnP.h
similarity index 100%
rename from crypt/sig_picnic/sha3/armv8a-neon/KeccakP-1600-SnP.h
rename to crypto/sig_picnic/sha3/armv8a-neon/KeccakP-1600-SnP.h
diff --git a/crypt/sig_picnic/sha3/armv8a-neon/KeccakP-1600-armv8a-neon.s b/crypto/sig_picnic/sha3/armv8a-neon/KeccakP-1600-armv8a-neon.s
similarity index 100%
rename from crypt/sig_picnic/sha3/armv8a-neon/KeccakP-1600-armv8a-neon.s
rename to crypto/sig_picnic/sha3/armv8a-neon/KeccakP-1600-armv8a-neon.s
diff --git a/crypt/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.cpp b/crypto/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.cpp
similarity index 100%
rename from crypt/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.cpp
rename to crypto/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.cpp
diff --git a/crypt/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.h b/crypto/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.h
similarity index 100%
rename from crypt/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.h
rename to crypto/sig_picnic/sha3/avx2/KeccakP-1600-AVX2.h
diff --git a/crypt/sig_picnic/sha3/avx2/KeccakP-1600-SnP.h b/crypto/sig_picnic/sha3/avx2/KeccakP-1600-SnP.h
similarity index 100%
rename from crypt/sig_picnic/sha3/avx2/KeccakP-1600-SnP.h
rename to crypto/sig_picnic/sha3/avx2/KeccakP-1600-SnP.h
diff --git a/crypt/sig_picnic/sha3/brg_endian.h b/crypto/sig_picnic/sha3/brg_endian.h
similarity index 100%
rename from crypt/sig_picnic/sha3/brg_endian.h
rename to crypto/sig_picnic/sha3/brg_endian.h
diff --git a/crypt/sig_picnic/sha3/opt64/KeccakP-1600-64.macros b/crypto/sig_picnic/sha3/opt64/KeccakP-1600-64.macros
similarity index 100%
rename from crypt/sig_picnic/sha3/opt64/KeccakP-1600-64.macros
rename to crypto/sig_picnic/sha3/opt64/KeccakP-1600-64.macros
diff --git a/crypt/sig_picnic/sha3/opt64/KeccakP-1600-SnP.h b/crypto/sig_picnic/sha3/opt64/KeccakP-1600-SnP.h
similarity index 100%
rename from crypt/sig_picnic/sha3/opt64/KeccakP-1600-SnP.h
rename to crypto/sig_picnic/sha3/opt64/KeccakP-1600-SnP.h
diff --git a/crypt/sig_picnic/sha3/opt64/KeccakP-1600-opt64-config.h b/crypto/sig_picnic/sha3/opt64/KeccakP-1600-opt64-config.h
similarity index 100%
rename from crypt/sig_picnic/sha3/opt64/KeccakP-1600-opt64-config.h
rename to crypto/sig_picnic/sha3/opt64/KeccakP-1600-opt64-config.h
diff --git a/crypt/sig_picnic/sha3/opt64/KeccakP-1600-opt64.c b/crypto/sig_picnic/sha3/opt64/KeccakP-1600-opt64.c
similarity index 100%
rename from crypt/sig_picnic/sha3/opt64/KeccakP-1600-opt64.c
rename to crypto/sig_picnic/sha3/opt64/KeccakP-1600-opt64.c
diff --git a/crypt/sig_picnic/sha3/opt64/KeccakP-1600-unrolling.macros b/crypto/sig_picnic/sha3/opt64/KeccakP-1600-unrolling.macros
similarity index 100%
rename from crypt/sig_picnic/sha3/opt64/KeccakP-1600-unrolling.macros
rename to crypto/sig_picnic/sha3/opt64/KeccakP-1600-unrolling.macros
diff --git a/crypt/sig_picnic/sign.c.template b/crypto/sig_picnic/sign.c.template
similarity index 100%
rename from crypt/sig_picnic/sign.c.template
rename to crypto/sig_picnic/sign.c.template
diff --git a/crypt/sig_picnic/simd.h b/crypto/sig_picnic/simd.h
similarity index 100%
rename from crypt/sig_picnic/simd.h
rename to crypto/sig_picnic/simd.h
diff --git a/crypt/sig_picnic/test.py b/crypto/sig_picnic/test.py
similarity index 100%
rename from crypt/sig_picnic/test.py
rename to crypto/sig_picnic/test.py
diff --git a/crypt/sig_picnic/tests/CMakeLists.txt b/crypto/sig_picnic/tests/CMakeLists.txt
similarity index 100%
rename from crypt/sig_picnic/tests/CMakeLists.txt
rename to crypto/sig_picnic/tests/CMakeLists.txt
diff --git a/crypt/sig_picnic/tests/api_test.c b/crypto/sig_picnic/tests/api_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/api_test.c
rename to crypto/sig_picnic/tests/api_test.c
diff --git a/crypt/sig_picnic/tests/bitstream_test.c b/crypto/sig_picnic/tests/bitstream_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/bitstream_test.c
rename to crypto/sig_picnic/tests/bitstream_test.c
diff --git a/crypt/sig_picnic/tests/extended_picnic_test.c b/crypto/sig_picnic/tests/extended_picnic_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/extended_picnic_test.c
rename to crypto/sig_picnic/tests/extended_picnic_test.c
diff --git a/crypt/sig_picnic/tests/hmac_sha256_test.c b/crypto/sig_picnic/tests/hmac_sha256_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/hmac_sha256_test.c
rename to crypto/sig_picnic/tests/hmac_sha256_test.c
diff --git a/crypt/sig_picnic/tests/hmac_sha384_test.c b/crypto/sig_picnic/tests/hmac_sha384_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/hmac_sha384_test.c
rename to crypto/sig_picnic/tests/hmac_sha384_test.c
diff --git a/crypt/sig_picnic/tests/hmac_sha512_test.c b/crypto/sig_picnic/tests/hmac_sha512_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/hmac_sha512_test.c
rename to crypto/sig_picnic/tests/hmac_sha512_test.c
diff --git a/crypt/sig_picnic/tests/kdf_shake256_test.c b/crypto/sig_picnic/tests/kdf_shake256_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/kdf_shake256_test.c
rename to crypto/sig_picnic/tests/kdf_shake256_test.c
diff --git a/crypt/sig_picnic/tests/lowmc_test.c b/crypto/sig_picnic/tests/lowmc_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/lowmc_test.c
rename to crypto/sig_picnic/tests/lowmc_test.c
diff --git a/crypt/sig_picnic/tests/mpc_test.c b/crypto/sig_picnic/tests/mpc_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/mpc_test.c
rename to crypto/sig_picnic/tests/mpc_test.c
diff --git a/crypt/sig_picnic/tests/mzd_test.c b/crypto/sig_picnic/tests/mzd_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/mzd_test.c
rename to crypto/sig_picnic/tests/mzd_test.c
diff --git a/crypt/sig_picnic/tests/picnic_test.c b/crypto/sig_picnic/tests/picnic_test.c
similarity index 100%
rename from crypt/sig_picnic/tests/picnic_test.c
rename to crypto/sig_picnic/tests/picnic_test.c
diff --git a/crypt/sig_picnic/tests/utils.c.i b/crypto/sig_picnic/tests/utils.c.i
similarity index 100%
rename from crypt/sig_picnic/tests/utils.c.i
rename to crypto/sig_picnic/tests/utils.c.i
diff --git a/crypt/sig_picnic/timing.c b/crypto/sig_picnic/timing.c
similarity index 100%
rename from crypt/sig_picnic/timing.c
rename to crypto/sig_picnic/timing.c
diff --git a/crypt/sig_picnic/timing.h b/crypto/sig_picnic/timing.h
similarity index 100%
rename from crypt/sig_picnic/timing.h
rename to crypto/sig_picnic/timing.h
diff --git a/crypt/sig_picnic/tools/bench.c b/crypto/sig_picnic/tools/bench.c
similarity index 100%
rename from crypt/sig_picnic/tools/bench.c
rename to crypto/sig_picnic/tools/bench.c
diff --git a/crypt/sig_picnic/tools/example.c b/crypto/sig_picnic/tools/example.c
similarity index 100%
rename from crypt/sig_picnic/tools/example.c
rename to crypto/sig_picnic/tools/example.c
diff --git a/crypt/sig_picnic/tools/genparams.c b/crypto/sig_picnic/tools/genparams.c
similarity index 100%
rename from crypt/sig_picnic/tools/genparams.c
rename to crypto/sig_picnic/tools/genparams.c
diff --git a/crypt/sig_picnic/tools/visualize_signature.c b/crypto/sig_picnic/tools/visualize_signature.c
similarity index 100%
rename from crypt/sig_picnic/tools/visualize_signature.c
rename to crypto/sig_picnic/tools/visualize_signature.c
diff --git a/crypt/test.c b/crypto/test.c
similarity index 100%
rename from crypt/test.c
rename to crypto/test.c
diff --git a/libdap.c b/libdap.c
new file mode 100644
index 0000000000..e69de29bb2
--
GitLab