projects / packages / cdcat.git / blame
| Commit | Line | Data |
|---|---|---|
| 3147724e JR |
1 | --- cdcat-2.3.1/src/newdbdialog.cpp~ 2013-08-08 09:25:39.000000000 +0200 |
| 2 | +++ cdcat-2.3.1/src/newdbdialog.cpp 2013-12-08 16:56:36.138613733 +0100 | |
| 3 | @@ -27,7 +27,7 @@ | |
| 4 | #include <string.h> | |
| 5 | ||
| 6 | #ifdef CATALOG_ENCRYPTION | |
| 7 | -#include <crypto++/blowfish.h> | |
| 8 | +#include <cryptopp/blowfish.h> | |
| 9 | #endif | |
| 10 | ||
| 11 | #include "icons.h" | |
| 12 | --- cdcat-2.3.1/src/wdbfile.h~ 2013-08-26 09:37:10.000000000 +0200 | |
| 13 | +++ cdcat-2.3.1/src/wdbfile.h 2013-12-08 16:56:59.665280229 +0100 | |
| 14 | @@ -18,12 +18,12 @@ | |
| 15 | ||
| 16 | #ifdef CATALOG_ENCRYPTION | |
| 17 | // libcrypto++ | |
| 18 | -#include <crypto++/osrng.h> | |
| 19 | -#include <crypto++/secblock.h> | |
| 20 | -#include <crypto++/blowfish.h> | |
| 21 | -#include <crypto++/filters.h> | |
| 22 | -#include <crypto++/modes.h> | |
| 23 | -#include <crypto++/hex.h> | |
| 24 | +#include <cryptopp/osrng.h> | |
| 25 | +#include <cryptopp/secblock.h> | |
| 26 | +#include <cryptopp/blowfish.h> | |
| 27 | +#include <cryptopp/filters.h> | |
| 28 | +#include <cryptopp/modes.h> | |
| 29 | +#include <cryptopp/hex.h> | |
| 30 | #endif | |
| 31 | ||
| 32 | #ifdef CATALOG_ENCRYPTION | |
| 9a88c1c4 JB |
33 | @@ -31,7 +31,7 @@ |
| 34 | ||
| 35 | static CryptoPP::SecByteBlock crypto_key(CryptoPP::Blowfish::BLOCKSIZE); | |
| 36 | ||
| 37 | -static byte iv[CryptoPP::Blowfish::BLOCKSIZE]; | |
| 38 | +static CryptoPP::byte iv[CryptoPP::Blowfish::BLOCKSIZE]; | |
| 39 | ||
| 40 | ||
| 41 | int generate_cryptokey(QString password); | |
| 3147724e JR |
42 | --- cdcat-2.3.1/src/cdcat.pro~ 2013-09-29 10:44:34.000000000 +0200 |
| 43 | +++ cdcat-2.3.1/src/cdcat.pro 2013-12-08 17:13:09.755273206 +0100 | |
| 44 | @@ -226,7 +226,7 @@ | |
| 45 | ||
| 46 | ###### encryption | |
| 47 | DEFINES += CATALOG_ENCRYPTION | |
| 48 | - LIBS+= -lcrypto++ -lpthread | |
| 49 | + LIBS+= -lcryptopp -lpthread | |
| 50 | ###### end encryption | |
| 51 | ||
| 52 | LIBS += -lz -lbz2 -ldl |