From 4e2bfa21260356f485029e7c684fa41ecf7e4802 Mon Sep 17 00:00:00 2001 From: anwleung Date: Sat, 3 Mar 2007 02:31:31 +0000 Subject: [PATCH] moved everything to cryptopp5.4 git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1168 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/aleung/security1/ceph/Makefile | 7 ++++--- .../aleung/security1/ceph/crypto/CryptoLib.cc | 8 -------- .../aleung/security1/ceph/crypto/CryptoLib.h | 11 ++++------- branches/aleung/security1/ceph/crypto/Makefile | 18 ++++++++++-------- .../aleung/security1/ceph/crypto/driver.cc | 3 +-- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/branches/aleung/security1/ceph/Makefile b/branches/aleung/security1/ceph/Makefile index 5be7292e1294a..35c5d0ca0c368 100644 --- a/branches/aleung/security1/ceph/Makefile +++ b/branches/aleung/security1/ceph/Makefile @@ -27,7 +27,8 @@ LDINC = ld -i -o endif CC = g++ -LIBS = -lpthread -lcrypto++5.2 +LIBS = -lpthread -lcryptopp +#LIBS = -lpthread -lcrypto++5.2 #CRYPTOLIBS = /usr/lib/libcrypto++5.2.so ifeq ($(want_bdb),yes) @@ -156,12 +157,12 @@ fakefuse: fakefuse.cc mon.o mds.o client.o osd.o osdc.o ebofs.o ${OSBDB_OBJ} cli ${CC} -pg ${CFLAGS} ${LIBS} ${OSBDB_LIBS} -lfuse $^ -o $@ fakesyn: fakesyn.cc mon.o mds.o client.o osd.o ebofs.o ${OSBDB_OBJ} osdc.o msg/FakeMessenger.o common.o crypto.o - ${CC} -pg ${CFLAGS} ${LIBS} ${OSBDB_LIBS} $^ -o $@ + ${CC} -pg ${CFLAGS} $^ -o $@ ${LIBS} ${OSBDB_LIBS} # mpi startup newsyn: newsyn.cc mon.o mds.o client.o osd.o ebofs.o ${OSBDB_OBJ} osdc.o msg/SimpleMessenger.o common.o crypto.o - ${MPICC} -pg ${MPICFLAGS} ${MPILIBS} ${OSBDB_LIBS} $^ -o $@ + ${MPICC} -pg ${MPICFLAGS} $^ -o $@ ${MPILIBS} ${OSBDB_LIBS} newsyn.nopg: newsyn.cc mon.o mds.o client.o osd.o ebofs.o ${OSBDB_OBJ} osdc.o msg/SimpleMessenger.o common.o crypto.o ${MPICC} ${MPICFLAGS} ${MPILIBS} ${OSBDB_LIBS} $^ -o $@ diff --git a/branches/aleung/security1/ceph/crypto/CryptoLib.cc b/branches/aleung/security1/ceph/crypto/CryptoLib.cc index 82b50ad5e1043..26b2cec093794 100644 --- a/branches/aleung/security1/ceph/crypto/CryptoLib.cc +++ b/branches/aleung/security1/ceph/crypto/CryptoLib.cc @@ -24,14 +24,12 @@ using namespace std; * block ciphers. This returns a encryptor mode * for encrypting using AC5. **********/ -/* CryptoLib::cfbRC5Enc CryptoLib::getRC5Enc(byte* key, const unsigned int keyLen, byte* iv) { cfbRC5Enc cfbEncryption(key, keyLen, iv); return cfbEncryption; } -*/ /********** * Generates a Cipher Feedback Mode @@ -39,38 +37,32 @@ CryptoLib::cfbRC5Enc CryptoLib::getRC5Enc(byte* key, * block ciphers. This returns a decryptor mode * for decrypting using RC5. **********/ -/* CryptoLib::cfbRC5Dec CryptoLib::getRC5Dec(byte* key, const unsigned int keyLen, byte* iv) { cfbRC5Dec cfbDecryption(key, keyLen, iv); return cfbDecryption; } -*/ /********** * Encrypts a block of data using Rijndael. * This assumes the out buffer is already * allocated to the right size. **********/ -/* void CryptoLib::encryptRC5(byte* plain, const unsigned int plainLen, byte* cipher, CryptoLib::cfbRC5Enc cfbEncryption) { cfbEncryption.ProcessData(cipher, plain, plainLen); } -*/ /********** * Decrypts a block of data using Rijndael. * This assumes the out buffer is already * allocated to the right size. **********/ -/* void CryptoLib::decryptRC5(byte* cipher, const unsigned int cipherLen, byte* plain, CryptoLib::cfbRC5Dec cfbDecryption) { cfbDecryption.ProcessData(plain, cipher, cipherLen); } -*/ /********** * Generates a Cipher Feedback Mode diff --git a/branches/aleung/security1/ceph/crypto/CryptoLib.h b/branches/aleung/security1/ceph/crypto/CryptoLib.h index b483762a52796..9763a5c4a2cc1 100644 --- a/branches/aleung/security1/ceph/crypto/CryptoLib.h +++ b/branches/aleung/security1/ceph/crypto/CryptoLib.h @@ -30,12 +30,10 @@ #include //encryption/decryption #include -//#include +#include #include #include -//#include"crypto_config.h" - #include using namespace std; @@ -57,20 +55,19 @@ namespace CryptoLib { typedef CryptoPP::RSASSA_PKCS1v15_SHA_Verifier rsaPub; typedef CryptoPP::CFB_Mode::Encryption cfbModeEnc; typedef CryptoPP::CFB_Mode::Decryption cfbModeDec; - //typedef CryptoPP::CFB_Mode::Encryption cfbRC5Enc; - //typedef CryptoPP::CFB_Mode::Decryption cfbRC5Dec; + typedef CryptoPP::CFB_Mode::Encryption cfbRC5Enc; + typedef CryptoPP::CFB_Mode::Decryption cfbRC5Dec; // symmetric block modes cfbModeEnc getCFBModeEnc(byte*, const unsigned int, byte*); cfbModeDec getCFBModeDec(byte*, const unsigned int, byte*); void encryptCFB(byte*, const unsigned int, byte*, cfbModeEnc); void decryptCFB(byte*, const unsigned int, byte*, cfbModeDec); - /* cfbRC5Enc getRC5Enc(byte*, const unsigned int, byte*); cfbRC5Dec getRC5Dec(byte*, const unsigned int, byte*); void encryptRC5(byte*, const unsigned int, byte*, cfbRC5Enc); void decryptRC5(byte*, const unsigned int, byte*, cfbRC5Dec); - */ + // asymmetric key generation esignPriv esignPrivKey(char*); diff --git a/branches/aleung/security1/ceph/crypto/Makefile b/branches/aleung/security1/ceph/crypto/Makefile index 88a70f8e540f7..1c3f3c5ae3952 100644 --- a/branches/aleung/security1/ceph/crypto/Makefile +++ b/branches/aleung/security1/ceph/crypto/Makefile @@ -2,8 +2,10 @@ CC = g++ CFLAGS = -g -Wall -I. -LIBS = -lpthread -CRYPTOLIBS = /usr/lib/libcrypto++5.2.so +LIBS = -lpthread -lcryptopp +#CRYPTOLIBS = /usr/lib/libcrypto++5.2.so +#CRYPTOLIBS = /usr/lib/libcryptopp.a +LIBDIR = -L /usr/lib/ SRCS=*.cc */*.cc *.h */*.h */*/*.h @@ -14,25 +16,25 @@ TEST_TARGETS = test all: depend ${TARGETS} driver: driver.cc CryptoLib.o - ${CC} ${CFLAGS} ${CRYPTOLIBS} ${LIBS} $^ -o $@ + ${CC} ${CFLAGS} $^ -o $@ ${LIBS} cryptolib: CryptoLib.cc ${CC} ${CFLAGS} $^ -c crypt: cryptTest.cc - ${CC} ${CFLAGS} ${CRYPTOLIBS} ${LIBS} $^ -o $@ + ${CC} ${CFLAGS} ${LIBS} $^ -o $@ encrypt: encTest.cc CryptoLib.o - ${CC} ${CFLAGS} ${CRYPTOLIBS} ${LIBS} $^ -o $@ + ${CC} ${CFLAGS} ${LIBS} $^ -o $@ retest: retest.cc CryptoLib.o - ${CC} ${CFLAGS} ${CRYPTOLIBS} ${LIBS} $^ -o $@ + ${CC} ${CFLAGS} ${LIBS} $^ -o $@ multiplex: multiplex.cc CryptoLib.o - ${CC} ${CFLAGS} ${CRYPTOLIBS} ${LIBS} $^ -o $@ + ${CC} ${CFLAGS} ${LIBS} $^ -o $@ test: test.cc - ${CC} ${CFLAGS} ${CRYPTOLIBS} ${LIBS} $^ -o $@ + ${CC} ${CFLAGS} ${LIBS} $^ -o $@ clean: rm -f *.o */*.o *~ *.core ${TARGETS} ${TEST_TARGETS} diff --git a/branches/aleung/security1/ceph/crypto/driver.cc b/branches/aleung/security1/ceph/crypto/driver.cc index 54eeaeba2d3b7..d940dd79a2a80 100644 --- a/branches/aleung/security1/ceph/crypto/driver.cc +++ b/branches/aleung/security1/ceph/crypto/driver.cc @@ -165,7 +165,6 @@ int main(int argc, char* argv[]) { decryptCFB(cipherMsg, plainLen, origMsg, myDec); cout << "My recovered message is " << origMsg << endl; - /* // RC5 encryption/decryption byte plainRC5[] = "My RC5 message to encrypt is even longer now"; unsigned int plainRC5len = strlen((const char*)plainRC5)+1; @@ -198,6 +197,6 @@ int main(int argc, char* argv[]) { //decrypt decryptRC5(cipherRC5, plainRC5len, recoverRC5, decRC5); cout << "My recovered message is " << recoverRC5 << endl; - */ + return 0; } -- 2.39.5