Promote some stuff from crypto.h to crypto_constants.h

Getting synced up with Steam main branch.

Author: zpostfacto

src/common/crypto.h

@@ -3,20 +3,12 @@
 #ifndef CRYPTO_H
 #define CRYPTO_H
 
-#include <tier0/dbg.h>		// for Assert & AssertMsg
-//#include "tier1/passwordhash.h"
-#include "keypair.h"
-#include "steam/steamtypes.h" // Salt_t
+#include <tier0/platform.h>
 #include "crypto_constants.h"
+//#include <tier1/passwordhash.h>
+#include "keypair.h"
 
-const unsigned int k_cubMD5Hash = 16;
-typedef	unsigned char MD5Digest_t[k_cubMD5Hash];
-
-const unsigned int k_cubSHA256Hash = 32;
-typedef	unsigned char SHA256Digest_t[ k_cubSHA256Hash ];
-
-const unsigned int k_cubSHA1Hash = 20;
-typedef	uint8 SHADigest_t[ k_cubSHA1Hash ];
+class CUtlBuffer;
 
 // Base class for symmetric encryption and decryption context.
 // A context is used when you want to use the same encryption

src/common/crypto_25519_donna.cpp

@@ -1,5 +1,6 @@
 //========= Copyright Valve LLC, All rights reserved. ========================
 #include "crypto.h"
+#include <tier0/dbg.h>
 
 #ifdef VALVE_CRYPTO_25519_DONNA
 

src/common/crypto_25519_openssl.cpp

@@ -1,5 +1,6 @@
 //========= Copyright Valve LLC, All rights reserved. ========================
 #include "crypto.h"
+#include <tier0/dbg.h>
 
 #ifdef STEAMNETWORKINGSOCKETS_CRYPTO_25519_OPENSSL
 

src/common/crypto_constants.h

@@ -4,6 +4,8 @@
 #define CRYPTO_CONSTANTS_H
 #pragma once
 
+#include <steam/steamtypes.h>
+
 const int k_nSymmetricBlockSize = 16;					// AES block size (128 bits)
 const int k_nSymmetricIVSize = 12;						// length of the IV (must be 12 for BCryptEncrypt/BCryptDecrypt, but OpenSSL is more flexible)
 const int k_nSymmetricGCMTagSize = 16;					// length in GCM tag (must be 16 for BCryptEncrypt/BCryptDecrypt, but OpenSSL is more flexible)
@@ -18,11 +20,19 @@ const int k_cubRSAEncryptedBlockSize	= 128;
 const int k_cubRSAPlaintextBlockSize	= 86 + 1;		// assume plaintext is text, so add a byte for the trailing \0
 const uint32 k_cubRSASignature = k_cubRSAEncryptedBlockSize;
 
+const uint32 k_cubRSA2048Signature = 256;				// Signature length when using a 2048-bit RSA key
+
 const int k_nAESKeyLenMax = k_nSymmetricKeyLen;
 const int k_nAESKeyLenMaxEncoded = k_nAESKeyLenMax*2; 
 const int k_nAESKeyBits = k_nSymmetricKeyLen*8;	// normal size of AES keys
 const int k_cchMaxPassphrase = 128;				// maximum size of a license passphrase
 
 const int k_nSHAHashStringLen = 40;				// length of SHA1 hash when stored as a hex string
 
+const unsigned int k_cubMD5Hash = 16;
+typedef	unsigned char MD5Digest_t[k_cubMD5Hash];
+
+const unsigned int k_cubSHA256Hash = 32;
+typedef	unsigned char SHA256Digest_t[ k_cubSHA256Hash ];
+
 #endif // CRYPTO_CONSTANTS_H