CryptoPP: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@8813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 69 insertions, 91 deletions

diff --git a/plugins/CryptoPP/src/cpp_rsau.cpp b/plugins/CryptoPP/src/cpp_rsau.cpp
index e9ad825dd0..b0913219fa 100644
--- a/plugins/CryptoPP/src/cpp_rsau.cpp
+++ b/plugins/CryptoPP/src/cpp_rsau.cpp
@@ -2,39 +2,41 @@
 

 const string padding = "PADDING!PADDING!PADDING!PADDING!"; // 256 bit

 

-

-string pad256(string& str) {

+string pad256(string& str)

+{

 	string out = str;

 	int pad = out.length() % 32;

-	if ( pad ) { // надо выровнять на 256 бит

-	    if ( pad>3 ) {

-		out += tlv(0,padding.substr(0,32-3-pad));

-	    }

-	    else {

-	    	if ( pad==3 ) out += string("\0\0\0");

-	    	else

-	    	if ( pad==2 ) out += string("\0\0");

-	    	else         out += string("\0");

-	    }

+	if (pad) { // надо выровнять на 256 бит

+		if (pad > 3) {

+			out += tlv(0, padding.substr(0, 32 - 3 - pad));

+		}

+		else {

+			if (pad == 3) out += string("\0\0\0");

+			else

+				if (pad == 2) out += string("\0\0");

+				else         out += string("\0");

+		}

 	}

 	return out;

 }

 

 

-string& add_delim(string& str, const string& del, int len) {

+string& add_delim(string& str, const string& del, int len)

+{

 	string val;

-	for ( u_int i=0; i<str.length(); i+=len ) {

-		val += str.substr(i,len) + del;

+	for (u_int i = 0; i < str.length(); i += len) {

+		val += str.substr(i, len) + del;

 	}

 	str = val;

 	return str;

 }

 

 

-string& del_delim(string& str, const string& del) {

+string& del_delim(string& str, const string& del)

+{

 	string val;

-	for ( u_int i=0; i<str.length(); i++ ) {

-		if ( del.find(str[i]) == string::npos )

+	for (u_int i = 0; i < str.length(); i++) {

+		if (del.find(str[i]) == string::npos)

 			val += str[i];

 	}

 	str = val;

@@ -42,157 +44,140 @@ string& del_delim(string& str, const string& del) {
 }

 

 

-string tlv(int t, const string& v) {

+string tlv(int t, const string& v)

+{

 	string b;

-	t |= v.length()<<8;

-	b.assign((const char*)&t,3);

+	t |= v.length() << 8;

+	b.assign((const char*)&t, 3);

 	b += v;

 	return b;

 }

 

 

-string tlv(int t, const char* v) {

+string tlv(int t, const char* v)

+{

 	return tlv(t, string(v));

 }

 

 

-string tlv(int t, int v) {

+string tlv(int t, int v)

+{

 	string s;

-	u_int l=(v<=0xFF)?1:((v<=0xFFFF)?2:((v<=0xFFFFFF)?3:4));

-	s.assign((char*)&v,l);

-	return tlv(t,s);

+	u_int l = (v <= 0xFF) ? 1 : ((v <= 0xFFFF) ? 2 : ((v <= 0xFFFFFF) ? 3 : 4));

+	s.assign((char*)&v, l);

+	return tlv(t, s);

 }

 

 

-string& un_tlv(string& b, int& t, string& v) {

+string& un_tlv(string& b, int& t, string& v)

+{

 	string r; v = r;

-	if ( b.length() > 3 ) {

+	if (b.length() > 3) {

 		t = 0;

-		b.copy((char*)&t,3);

-		u_int l = t>>8;

+		b.copy((char*)&t, 3);

+		u_int l = t >> 8;

 		t &= 0xFF;

-		if ( b.length() >= 3+l ) {

-		  v = b.substr(3,l);

-		  r = b.substr(3+l);

+		if (b.length() >= 3 + l) {

+			v = b.substr(3, l);

+			r = b.substr(3 + l);

 		}

 	}

-	if ( !v.length() ) {

+	if (!v.length()) {

 		t = -1;

 	}

 	b = r;

 	return b;

 }

 

-

-string& un_tlv(string& b, int& t, int& v) {

+string& un_tlv(string& b, int& t, int& v)

+{

 	string s;

-	un_tlv(b,t,s);

+	un_tlv(b, t, s);

 	v = 0;

-	s.copy((char*)&v,s.length());

+	s.copy((char*)&v, s.length());

 	return b;

 }

 

-

-int str2int(string& s) {

+int str2int(string& s)

+{

 	int v = 0;

-	if ( s.length()<=sizeof(int) )

-		s.copy((char*)&v,s.length());

+	if (s.length() <= sizeof(int))

+		s.copy((char*)&v, s.length());

 	return v;

 }

 

-

 string hash(string& b)

 {

-	return ::hash((PBYTE)b.data(),b.length());

+	return ::hash((PBYTE)b.data(), b.length());

 }

 

-

 string hash(PBYTE b, int l)

 {

 	BYTE h[RSA_KEYSIZE];

 	RSA_CalculateDigest(h, b, l);

-	string s; s.assign((char*)&h,RSA_KEYSIZE);

+	string s; s.assign((char*)&h, RSA_KEYSIZE);

 	return s;

 }

 

-

 string hash128(string& b)

 {

-	return hash128((PBYTE)b.data(),b.length());

+	return hash128((PBYTE)b.data(), b.length());

 }

 

-

 string hash128(LPSTR b)

 {

-	return hash128((PBYTE)b,strlen(b));

+	return hash128((PBYTE)b, strlen(b));

 }

 

-

 string hash128(PBYTE b, int l)

 {

 	BYTE h[RIPEMD128::DIGESTSIZE];

 	RIPEMD128().CalculateDigest(h, b, l);

-	string s; s.assign((char*)&h,sizeof(h));

+	string s; s.assign((char*)&h, sizeof(h));

 	return s;

 }

 

-

 string hash256(string& b)

 {

-	return hash256((PBYTE)b.data(),b.length());

+	return hash256((PBYTE)b.data(), b.length());

 }

 

-

 string hash256(LPSTR b)

 {

-	return hash256((PBYTE)b,strlen(b));

+	return hash256((PBYTE)b, strlen(b));

 }

 

-

 string hash256(PBYTE b, int l)

 {

-//	BYTE h[SHA256::DIGESTSIZE];

-//	SHA256().CalculateDigest(h, b, l);

 	BYTE h[RIPEMD256::DIGESTSIZE];

 	RIPEMD256().CalculateDigest(h, b, l);

-	string s; s.assign((char*)&h,sizeof(h));

+	string s; s.assign((char*)&h, sizeof(h));

 	return s;

 }

 

-

 Integer BinaryToInteger(const string& data)

 {

-  StringSource ss(data, true, NULL);

-  SecByteBlock result(ss.MaxRetrievable());

-  ss.Get(result, result.size());

-  return Integer(result, result.size());

+	StringSource ss(data, true, NULL);

+	SecByteBlock result(ss.MaxRetrievable());

+	ss.Get(result, result.size());

+	return Integer(result, result.size());

 }

 

-

 string IntegerToBinary(const Integer& value)

 {

-  SecByteBlock sbb(value.MinEncodedSize());

-  value.Encode(sbb, sbb.size());

-  string data;

-  StringSource(sbb, sbb.size(), true, new StringSink(data)); 

-  return data;

+	SecByteBlock sbb(value.MinEncodedSize());

+	value.Encode(sbb, sbb.size());

+	string data;

+	StringSource(sbb, sbb.size(), true, new StringSink(data));

+	return data;

 }

 

-/*

-RandomPool& GlobalRNG()

-{

-	static RandomPool randomPool;

-	return randomPool;

-}

-*/

-

 AutoSeededRandomPool& GlobalRNG()

 {

 	static AutoSeededRandomPool randomPool;

 	return randomPool;

 }

 

-

 void GenerateRSAKey(unsigned int keyLength, string& privKey, string& pubKey)

 {

 	RSAES_PKCS1v15_Decryptor priv(GlobalRNG(), keyLength);

@@ -206,7 +191,6 @@ void GenerateRSAKey(unsigned int keyLength, string& privKey, string& pubKey)
 	pubFile.MessageEnd();

 }

 

-

 string RSAEncryptString(const RSA::PublicKey& pubkey, const string& plaintext)

 {

 	RSAES_PKCS1v15_Encryptor pub(pubkey);

@@ -216,7 +200,6 @@ string RSAEncryptString(const RSA::PublicKey& pubkey, const string& plaintext)
 	return result;

 }

 

-

 string RSADecryptString(const RSA::PrivateKey& privkey, const string& ciphertext)

 {

 	RSAES_PKCS1v15_Decryptor priv(privkey);

@@ -225,13 +208,12 @@ string RSADecryptString(const RSA::PrivateKey& privkey, const string& ciphertext
 	try {

 		StringSource(ciphertext, true, new PK_DecryptorFilter(GlobalRNG(), priv, new StringSink(result)));

 	}

-	catch (...)	{

+	catch (...) {

 		;

 	}

 	return result;

 }

 

-

 string RSASignString(const RSA::PrivateKey& privkey, const string& plaintext)

 {

 	RSASSA_PKCS1v15_SHA_Signer priv(privkey);

@@ -240,19 +222,15 @@ string RSASignString(const RSA::PrivateKey& privkey, const string& plaintext)
 	try {

 		StringSource(plaintext, true, new SignerFilter(GlobalRNG(), priv, new StringSink(result)));

 	}

-	catch (...)	{

+	catch (...) {

 		;

 	}

 	return result;

 }

 

-

 BOOL RSAVerifyString(const RSA::PublicKey& pubkey, const string& plaintext, const string& sig)

 {

-  RSASSA_PKCS1v15_SHA_Verifier ver(pubkey);

+	RSASSA_PKCS1v15_SHA_Verifier ver(pubkey);

 

-  return ver.VerifyMessage((PBYTE)plaintext.data(), plaintext.length(), (PBYTE)sig.data(), sig.length());

+	return ver.VerifyMessage((PBYTE)plaintext.data(), plaintext.length(), (PBYTE)sig.data(), sig.length());

 }

-

-

-// EOF