Ver código fonte

Moved some static member variables which are not exposed as public to unnamed namespace.

Tatsuhiro Tsujikawa 14 anos atrás
pai
commit
2373c62205
2 arquivos alterados com 8 adições e 16 exclusões
  1. 8 3
      src/MSEHandshake.cc
  2. 0 13
      src/MSEHandshake.h

+ 8 - 3
src/MSEHandshake.cc

@@ -59,11 +59,16 @@
 
 namespace aria2 {
 
-const unsigned char* MSEHandshake::PRIME = reinterpret_cast<const unsigned char*>("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A63A36210000000000090563");
+namespace {
 
-const unsigned char* MSEHandshake::GENERATOR = reinterpret_cast<const unsigned char*>("2");
+const size_t MAX_PAD_LENGTH = 512;
+const size_t CRYPTO_BITFIELD_LENGTH = 4;
+const unsigned char VC[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
-const unsigned char MSEHandshake::VC[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+const unsigned char* PRIME = reinterpret_cast<const unsigned char*>("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A63A36210000000000090563");
+const unsigned char* GENERATOR = reinterpret_cast<const unsigned char*>("2");
+
+} // namespace
 
 MSEHandshake::MSEHandshake
 (cuid_t cuid,

+ 0 - 13
src/MSEHandshake.h

@@ -70,15 +70,8 @@ public:
 
 private:
   static const size_t PRIME_BITS = 768;
-  
   static const size_t KEY_LENGTH = (PRIME_BITS+7)/8;
-  
-  static const size_t MAX_PAD_LENGTH = 512;
-
   static const size_t VC_LENGTH = 8;
-
-  static const size_t CRYPTO_BITFIELD_LENGTH = 4;
-
   // The largest buffering occurs when receiver receives step2
   // handshake.  We believe that IA is less than or equal to
   // BtHandshakeMessage::MESSAGE_LENGTH
@@ -108,12 +101,6 @@ private:
   unsigned char* ia_;
   SharedHandle<MessageDigest> sha1_;
 
-  static const unsigned char* PRIME;
-
-  static const unsigned char* GENERATOR;
-
-  static const unsigned char VC[VC_LENGTH];
-
   void encryptAndSendData(const unsigned char* data, size_t length);
 
   void createReq1Hash(unsigned char* md) const;