Waiting for ClientMonitor to respond with ACK

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1074 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/aleung/security1/ceph/client/Client.h b/branches/aleung/security1/ceph/client/Client.h
index 59ac39366a1c444f82cf55e5e7b3f304d17f0398..1c2210a6f04c4122821cb0564813de86630ec384 100644 (file)
--- a/branches/aleung/security1/ceph/client/Client.h
+++ b/branches/aleung/security1/ceph/client/Client.h
@@ -39,6 +39,12 @@
 
 #include "FileCache.h"
 
+#include "crypto/CryptoLib.h"
+using namespace CryptoLib;
+
+#include "crypto/Ticket.h"
+//#include "User.h"
+
 // stl
 #include <set>
 #include <map>

diff --git a/branches/aleung/security1/ceph/client/User.h b/branches/aleung/security1/ceph/client/User.h
index 9a8fb1ed54a759f81e769d5764c4361fe58df4bb..ce6b11fc37b353177468b3ec05053a3339ec3761 100644 (file)
--- a/branches/aleung/security1/ceph/client/User.h
+++ b/branches/aleung/security1/ceph/client/User.h
@@ -21,7 +21,7 @@ class User {
   char *username;
   esignPub myPubKey;
   // a kerberos like certification ticket
-  certTicket *ticket;
+  Ticket *ticket;
 
  public:
   // the pub/prv key pair must exist before hand. The user

diff --git a/branches/aleung/security1/ceph/crypto/Ticket.h b/branches/aleung/security1/ceph/crypto/Ticket.h
index 9f505ed02595f9100f6d1048f49efeb84854600e..c117774eb9105cf7c9ca5254c48231997a8be5b1 100644 (file)
--- a/branches/aleung/security1/ceph/crypto/Ticket.h
+++ b/branches/aleung/security1/ceph/crypto/Ticket.h
@@ -30,7 +30,7 @@ class Ticket {
   string pubKey;
   esignPub realKey;
   FixedSigBuf allocSig;
-  SigBug signature;
+  SigBuf signature;
   bool keyConverted;
   bool sigConverted;
 

diff --git a/branches/aleung/security1/ceph/messages/MClientAuthUser.h b/branches/aleung/security1/ceph/messages/MClientAuthUser.h
index ee4a11631ed9f1eedb6f581e0c73e63439675a1c..d72afca05cd5c31c4c695ce3b5bb86b0cef6df36 100644 (file)
--- a/branches/aleung/security1/ceph/messages/MClientAuthUser.h
+++ b/branches/aleung/security1/ceph/messages/MClientAuthUser.h
@@ -30,7 +30,7 @@ class MClientAuthUser : public Message {
 
   char *get_type_name() { return "client_auth_user"; }
   const string& get_str_key() { return pubKey; }
-  esignPub get_key() { return _fromString_esignPubKey(pubKey); }
+  esignPub get_key() { return _fromStr_esignPubKey(pubKey); }
   string get_username() { return username; }
   uid_t get_uid() { return uid; }
   gid_t get_gid() { return gid; }