Bug#1121410: RFS: cryfs/1.0.1-1 [ITA] [RC] -- encrypt your files and store them in the cloud

[Bastian Germann <bage@debian.org>]

Please find a patch that would be a prerequisite for that.

>From 116cce45442691a8da0c8ed67e8f3ab617205504 Mon Sep 17 00:00:00 2001
From: Bastian Germann <bage@debian.org>
Date: Wed, 26 Nov 2025 13:31:13 +0100
Subject: [PATCH] Prevent building with vendor_cryptopp

---
 src/cpp-utils/crypto/symmetric/ciphers.h     | 12 ++++++------
 src/cpp-utils/data/FixedSizeData.h           |  2 +-
 src/cpp-utils/random/RandomGeneratorThread.h |  2 +-
 vendor/CMakeLists.txt                        |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/cpp-utils/crypto/symmetric/ciphers.h b/src/cpp-utils/crypto/symmetric/ciphers.h
index 0bae6866..922b4601 100644
--- a/src/cpp-utils/crypto/symmetric/ciphers.h
+++ b/src/cpp-utils/crypto/symmetric/ciphers.h
@@ -2,12 +2,12 @@
 #ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
 #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
 
-#include <vendor_cryptopp/aes.h>
-#include <vendor_cryptopp/twofish.h>
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
-#include <vendor_cryptopp/chachapoly.h>
+#include <crypto++/aes.h>
+#include <crypto++/twofish.h>
+#include <crypto++/serpent.h>
+#include <crypto++/cast.h>
+#include <crypto++/mars.h>
+#include <crypto++/chachapoly.h>
 #include "GCM_Cipher.h"
 #include "CFB_Cipher.h"
 
diff --git a/src/cpp-utils/data/FixedSizeData.h b/src/cpp-utils/data/FixedSizeData.h
index 86f44a7e..9098af87 100644
--- a/src/cpp-utils/data/FixedSizeData.h
+++ b/src/cpp-utils/data/FixedSizeData.h
@@ -2,7 +2,7 @@
 #ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
 #define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
 
-#include <vendor_cryptopp/hex.h>
+#include <crypto++/hex.h>
 #include <string>
 #include <array>
 #include <cstring>
diff --git a/src/cpp-utils/random/RandomGeneratorThread.h b/src/cpp-utils/random/RandomGeneratorThread.h
index 593750ed..f9297a04 100644
--- a/src/cpp-utils/random/RandomGeneratorThread.h
+++ b/src/cpp-utils/random/RandomGeneratorThread.h
@@ -4,7 +4,7 @@
 
 #include "../thread/LoopThread.h"
 #include "ThreadsafeRandomDataBuffer.h"
-#include <vendor_cryptopp/osrng.h>
+#include <crypto++/osrng.h>
 
 namespace cpputils {
     //TODO Test
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index cd970dfc..e69de29b 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -1 +0,0 @@
-add_subdirectory(cryptopp)