Big check in. Glacier client authentication (certificate verification) has

    been added, SSL logging has been removed, a few clean-ups have taken
    place. Getting ready for SSL Extension refactoring.

1 files changed, 6 insertions, 9 deletions

diff --git a/cpp/src/Ice/MessageAuthenticator.h b/cpp/src/Ice/MessageAuthenticator.h
index 246961426e0..b20f4bbaa67 100644
--- a/cpp/src/Ice/MessageAuthenticator.h
+++ b/cpp/src/Ice/MessageAuthenticator.h
@@ -21,25 +21,22 @@ namespace IceSecurity
 namespace SecureUdp
 {
 
-using IceUtil::Shared;
-using Ice::ByteSeq;
-
-class MessageAuthenticator : public Shared
+class MessageAuthenticator : public IceUtil::Shared
 {
 
 public:
     MessageAuthenticator();
-    MessageAuthenticator(const ByteSeq&);
+    MessageAuthenticator(const Ice::ByteSeq&);
     virtual ~MessageAuthenticator();
 
-    virtual ByteSeq computeMAC(const ByteSeq&) const;
+    virtual Ice::ByteSeq computeMAC(const Ice::ByteSeq&) const;
 
-    virtual bool authenticate(const ByteSeq&, const ByteSeq&);
+    virtual bool authenticate(const Ice::ByteSeq&, const Ice::ByteSeq&);
 
-    virtual const ByteSeq& getMACKey() const;
+    virtual const Ice::ByteSeq& getMACKey() const;
 
 protected:
-    ByteSeq _macKeyBytes;
+    Ice::ByteSeq _macKeyBytes;
 
 };