diff --git a/cryptolib/botan/algo_frodokem/.gitignore b/cryptolib/botan/algo_frodokem/.gitignore
new file mode 100644
index 0000000..1294176
--- /dev/null
+++ b/cryptolib/botan/algo_frodokem/.gitignore
@@ -0,0 +1,2 @@
+bin/
+results/
diff --git a/cryptolib/botan/algo_frodokem/Makefile b/cryptolib/botan/algo_frodokem/Makefile
new file mode 100644
index 0000000..b813695
--- /dev/null
+++ b/cryptolib/botan/algo_frodokem/Makefile
@@ -0,0 +1,8 @@
+all: frodokem
+
+frodokem: frodokem.cpp
+	mkdir -p bin
+	g++-11 -std=c++20 -g -O3 -Wall -I ../botan/build/include -Wl,-rpath=../botan/ $^ -o bin/$@ -L ../botan/ -l:libbotan-3.a
+
+clean:
+	rm -rf bin/
diff --git a/cryptolib/botan/algo_frodokem/data_run.sh b/cryptolib/botan/algo_frodokem/data_run.sh
new file mode 100755
index 0000000..54996de
--- /dev/null
+++ b/cryptolib/botan/algo_frodokem/data_run.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+PINFLAGS="--phase1 --phase2 --export --parallel"
+export RESULTDIR=/new_data/ssd1/data/wagner/bsi/DATA/results/algo_frodokem
+
+
+pushd ${BASH_SOURCE%/*}
+
+if [[ $1 == "clean" || $2 == "clean" ]]; then
+    rm -rf $RESULTDIR
+fi
+
+./framework.sh ${PINFLAGS} KEM640_SHAKE
+
+if [[ $1 == "test" || $2 == "test" ]]; then
+    popd
+    exit 0
+fi
+
+./framework.sh ${PINFLAGS} KEM976_SHAKE
+./framework.sh ${PINFLAGS} KEM1344_SHAKE
+./framework.sh ${PINFLAGS} eKEM640_SHAKE
+./framework.sh ${PINFLAGS} eKEM976_SHAKE
+./framework.sh ${PINFLAGS} eKEM1344_SHAKE
+
+./framework.sh ${PINFLAGS} KEM640_AES
+./framework.sh ${PINFLAGS} KEM976_AES
+./framework.sh ${PINFLAGS} KEM1344_AES
+./framework.sh ${PINFLAGS} eKEM640_AES
+./framework.sh ${PINFLAGS} eKEM976_AES
+./framework.sh ${PINFLAGS} eKEM1344_AES
+
+popd
diff --git a/cryptolib/botan/algo_frodokem/framework.sh b/cryptolib/botan/algo_frodokem/framework.sh
new file mode 100755
index 0000000..19e346a
--- /dev/null
+++ b/cryptolib/botan/algo_frodokem/framework.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+#########################################################################
+# DO NOT CHANGE: Preparing DATA
+#------------------------------------------------------------------------
+source "${DATA_COMMON}/DATA_init.sh" || { echo "source data.sh first!" && exit 1; }
+#########################################################################
+
+#------------------------------------------------------------------------
+# Specify your framework settings used by DATA
+#------------------------------------------------------------------------
+
+# The name of the framework. Do not use spaces or special characters.
+export FRAMEWORK=botan
+
+# The file containing all supported algorithms
+export TARGETFILE=targets.txt
+
+# The number of measurements for difference detection (phase1)
+export PHASE1_TRACES=3
+
+# The number of constant keys for generic tests (phase2)
+# Make sure that PHASE2_FIXEDKEYS <= PHASE1_TRACES
+export PHASE2_FIXEDKEYS=3
+
+# The number of measurements per constant key for generic tests (phase2)
+export PHASE2_TRACES=100
+
+# The number of measurements for specific tests (phase3)
+export PHASE3_TRACES=200
+
+# (Optional) Additional flags for the pintool. Supported flags are:
+#  -main <main>    Start recording at function <main>. Note that the <main>
+#                  symbol must exist, otherwise this will yield empty traces!
+#  -heap           Trace heap allocations and replace heap addresses with
+#                  relative offset
+export PINTOOL_ARGS="-heap"
+
+#------------------------------------------------------------------------
+# Implement your framework-specific callbacks
+#------------------------------------------------------------------------
+#
+# Globally available environment variables:
+#   $FRAMEWORK           The framework name
+#   $BASEDIR             The absolute directory path of this script
+#   $DATA_COMMON         The absolute directory for common DATA scripts
+#   $DATA_LEAKAGE_MODELS The absolute directory for DATA leakage models
+#
+# Available for cb_genkey, cb_pre_run, cb_run_command, cb_post_run
+#   $ALGO       The currently tested algo
+#
+# Available for cb_pre_run, cb_run_command, cb_post_run
+#   $ENVFILE
+
+export BINARY=${PWD}/bin/frodokem
+
+# The leakage model of phase 3.
+# See ${DATA_LEAKAGE_MODELS} for all options.
+export SPECIFIC_LEAKAGE_CALLBACK=${DATA_LEAKAGE_MODELS}/rsa_privkey_hw.py
+
+# DATA callback for setting up the framework to analyze. This callback
+# is invoked once inside the current directory before analysis starts.
+# Implement framework-specific tasks here like framework compilation.
+function cb_prepare_framework {
+  :
+}
+
+# DATA callback for generating keys. This callback is invoked every
+# time a new key is needed. Implement key generation according to
+# your algorithm and store the generated key inside a file named $2.
+#
+# $1 ... key file name
+function cb_genkey {
+  ${BINARY} ${ALGO} keygen $1
+  RES=$((RES + $?))
+}
+
+# DATA callback for custom commands that are executed immediately before 
+# the algorithm is profiled. It is executed in a temporary directory 
+# which contains the keyfile $1 and ${ENVFILE}.
+#
+# If 'cb_run_command' needs any other files, copy them to ${PWD}. 
+#
+# $1 ... key file name
+function cb_pre_run {
+  log_verbose "running with key $1"
+}
+
+# DATA callback for the main invocation of the tested algorithm.
+# It shall return the bash command to execute as string. It is
+# executed inside a temporary directory with a clean environment.
+# If you need special files or environment variables set, specify
+# them in cb_pre_run.
+#
+# $1 ... key file name
+function cb_run_command {
+  echo "${BINARY} ${ALGO} kem $1"
+}
+
+# DATA callback for custom commands that are executed immediately after 
+# the algorithm is profiled. It is executed in a temporary directory.
+# You can cleanup any custom files generated by your algorithm.
+#
+# $1 ... key file name
+function cb_post_run {
+  :
+}
+
+# DATA callback for preparing an individual algorithm. It shall:
+# 1. Parse the next algorithm from the commandline string of all algorithms
+#    and set up anything necessary for analyzing this algorithm.
+#    If the algorithm needs additional parameters (like key sizes), 
+#    increase $SHIFT accordingly.
+# 2. Configure $WORKDIR, which will create a subdirectory holding all
+#    intermediate files generated by the algorithm and the results.
+#    Do not use an absolute path!
+#
+# $* ... algorithm string from the commandline
+function cb_prepare_algo {
+  ALGO=$1
+  # key bits
+  SHIFT=$((SHIFT))
+
+  WORKDIR="frodoKEM-$ALGO"
+}
+
+#########################################################################
+# DO NOT CHANGE: Running DATA's commandline parser
+#------------------------------------------------------------------------
+DATA_parse "$@"
+#------------------------------------------------------------------------
+# DO NOT ADD CODE AFTER THIS LINE
+#########################################################################
diff --git a/cryptolib/botan/algo_frodokem/frodokem.cpp b/cryptolib/botan/algo_frodokem/frodokem.cpp
new file mode 100644
index 0000000..9729851
--- /dev/null
+++ b/cryptolib/botan/algo_frodokem/frodokem.cpp
@@ -0,0 +1,143 @@
+#include <cassert>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <vector>
+using namespace std;
+
+#include <botan/block_cipher.h>
+#include <botan/auto_rng.h>
+#include <botan/rng.h>
+#include <botan/hex.h>
+#include <botan/frodokem.h>
+#include <botan/pubkey.h>
+
+vector<string> modes = {
+  "KEM640_SHAKE",
+};
+
+vector<string> operations = {
+  "keygen",
+  "kem"
+};
+
+const size_t shared_secret_length = 32;
+
+Botan::FrodoKEMMode name_to_mode(const std::string& algo_name) {
+ if(algo_name == "KEM640_SHAKE")
+    { return Botan::FrodoKEMMode::FrodoKEM640_SHAKE; }
+ if(algo_name == "KEM976_SHAKE")
+    { return Botan::FrodoKEMMode::FrodoKEM976_SHAKE; }
+ if(algo_name == "KEM1344_SHAKE")
+    { return Botan::FrodoKEMMode::FrodoKEM1344_SHAKE; }
+ if(algo_name == "eKEM640_SHAKE")
+    { return Botan::FrodoKEMMode::eFrodoKEM640_SHAKE; }
+ if(algo_name == "eKEM976_SHAKE")
+    { return Botan::FrodoKEMMode::eFrodoKEM976_SHAKE; }
+ if(algo_name == "eKEM1344_SHAKE")
+    { return Botan::FrodoKEMMode::eFrodoKEM1344_SHAKE; }
+ if(algo_name == "KEM640_AES")
+    { return Botan::FrodoKEMMode::FrodoKEM640_AES; }
+ if(algo_name == "KEM976_AES")
+    { return Botan::FrodoKEMMode::FrodoKEM976_AES; }
+ if(algo_name == "KEM1344_AES")
+    { return Botan::FrodoKEMMode::FrodoKEM1344_AES; }
+ if(algo_name == "eKEM640_AES")
+    { return Botan::FrodoKEMMode::eFrodoKEM640_AES; }
+ if(algo_name == "eKEM976_AES")
+    { return Botan::FrodoKEMMode::eFrodoKEM976_AES; }
+ if(algo_name == "eKEM1344_AES")
+    { return Botan::FrodoKEMMode::eFrodoKEM1344_AES; }
+
+ assert(false);
+}
+
+void frodokem_encrypt(
+        Botan::FrodoKEM_PublicKey pub_key,
+        Botan::secure_vector<uint8_t> &cipher_text,
+        Botan::secure_vector<uint8_t> &sym_key
+        ) {
+    Botan::AutoSeeded_RNG rng;
+    auto encryptor = Botan::PK_KEM_Encryptor(pub_key, "KDF2(SHA-256)", "");
+    encryptor.encrypt(cipher_text, sym_key, rng, shared_secret_length);
+}
+
+void frodokem_decrypt(
+        Botan::FrodoKEM_PrivateKey priv_key,
+        Botan::secure_vector<uint8_t> &cipher_text,
+        Botan::secure_vector<uint8_t> &sym_key
+        ) {
+    Botan::AutoSeeded_RNG rng;
+    auto decryptor = Botan::PK_KEM_Decryptor(priv_key, rng, "KDF2(SHA-256)", "");
+    sym_key = decryptor.decrypt(cipher_text.data(), cipher_text.size(), shared_secret_length);
+}
+
+int main(int argc, char* argv[]) {
+  Botan::AutoSeeded_RNG rng;
+
+  if (argc != 4) {
+    cout << "Usage:\n\n"
+              << "  frodokem <mode> <operation> <frodokemkeyfile>\n\n"
+              << "    <mode> ..... asymmetric cipher mode\n"
+              << "    <operation> ..... operation to execute, e.g. keygen or kem\n"
+              << "    <frodokemkeyfile> ... frodokem key file, read as text\n"
+              << endl;
+    cout << "List of available modes:" << endl;
+    for(vector<string>::size_type i = 0; i != modes.size(); i++) {
+      cout << "  " << modes[i] << endl;
+    }
+    cout << endl;
+    cout << "List of available operations:" << endl;
+    for(vector<string>::size_type i = 0; i != operations.size(); i++) {
+      cout << "  " << operations[i] << endl;
+    }
+    cout << endl;
+    return (1);
+  }
+
+  string str_mode (argv[1]);
+  string str_operation (argv[2]);
+  string str_frodokemkeyfile (argv[3]);
+
+  Botan::FrodoKEMMode mode = name_to_mode(str_mode);
+
+  std::string frodokemkeyfile_buffer_sk(str_frodokemkeyfile);
+
+  if (str_operation == "keygen") {
+    // Alice KeyGen
+    const Botan::FrodoKEM_PrivateKey priv_key(rng, mode);
+    const auto priv_key_bits = priv_key.private_key_bits();
+
+    // Store key pair
+    ofstream frodokemkeyfile_sk;
+    frodokemkeyfile_sk.open(frodokemkeyfile_buffer_sk);
+    frodokemkeyfile_sk << Botan::hex_encode(priv_key_bits);
+    frodokemkeyfile_sk.close();
+  } else if (str_operation == "kem") {
+    Botan::secure_vector<uint8_t> cipher_text, key_bob, key_alice;
+
+    // Load key pair
+    string line_sk;
+    ifstream frodokemkeyfile_sk;
+    frodokemkeyfile_sk.open(frodokemkeyfile_buffer_sk);
+    getline(frodokemkeyfile_sk, line_sk);
+    frodokemkeyfile_sk.close();
+    Botan::secure_vector<uint8_t> priv_key_bits = Botan::hex_decode_locked(line_sk);
+
+    Botan::FrodoKEM_PrivateKey priv_key(priv_key_bits, mode);
+    const auto pk = priv_key.public_key();
+    const auto pk_bits = pk->public_key_bits();
+    Botan::FrodoKEM_PublicKey pub_key(pk_bits, mode);
+
+    frodokem_encrypt(pub_key, cipher_text, key_bob);
+    frodokem_decrypt(priv_key, cipher_text, key_alice);
+
+    assert(key_bob == key_alice);
+  } else {
+    cout << str_operation << " is no valid operation!" << endl;
+    assert(false);
+  }
+
+  return (0);
+}
+