[1/2] extended crypto classes

Commit Message

Christian Brunner Aug. 25, 2011, 11:02 a.m. UTC

This patch extends the ceph crypto classes:

- map CryptoPP::HashTransformation to ceph::crypto::Digest (for cryptopp)
- add DigestSize() to ceph::crypto::Digest (for libnss)

Thanks,
Christian
---
 src/common/ceph_crypto.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/src/common/ceph_crypto.h b/src/common/ceph_crypto.h
index 23a0589..7082317 100644
--- a/src/common/ceph_crypto.h
+++ b/src/common/ceph_crypto.h
@@ -11,6 +11,7 @@ 
 #ifdef USE_CRYPTOPP
 # define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 #include <string.h>
+# include <cryptopp/cryptlib.h>
 # include <cryptopp/md5.h>
 # include <cryptopp/sha.h>
 # include <cryptopp/hmac.h>
@@ -32,6 +33,8 @@  namespace ceph {
 	}
       ~HMACSHA1();
     };
+
+    class Digest : public CryptoPP::HashTransformation { };
   }
 }
 #elif USE_NSS
@@ -86,6 +89,9 @@  namespace ceph {
 	assert(dummy == digest_size);
 	Restart();
       }
+      size_t DigestSize() {
+        return digest_size;
+      }
     };
     class MD5 : public Digest {
     public: