x64 fixICU fixes

git-svn-id: svn://db.shs.com.ru/pip@100 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

CMakeLists.txt

@@ -126,12 +126,12 @@ endif ()
 
 # Check if PIP support cryptographic encryption/decryption by using sodium library
 if (DEFINED CRYPT)
-	message(STATUS "Building with CRYPT support")
+	message(STATUS "Building with crypt support")
 	unset(CRYPT)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPIP_CRYPT")
 	list(APPEND LIBS sodium)
 else ()
-	message(STATUS "Building without CRYPT, encryption doesn't work")
+	message(STATUS "Building without crypt support")
 endif ()
 
 

main.cpp

@@ -136,85 +136,6 @@ public:
 
 //#include <netdb.h>
 
-
-template<int Precision = 0, typename Type = int>
-class FixedPoint {
-//	friend PICout operator <<(PICout s, const FixedPoint<> & v);
-public:
-	typedef FixedPoint<Precision, Type> fp;
-	FixedPoint(const Type &v = Type()) {val = fpv(v);}
-	FixedPoint(const fp &v) {val = v.val;}
-	FixedPoint(const float &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));}
-	FixedPoint(const double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));}
-//	FixedPoint(const long double &v) {val = Precision == 0 ? Type(v) : Type(v * (2 << Precision-1));}
-
-	template<typename T>
-	fp & operator=(const T & v) {val = fpv(Type(v)); return *this;}
-	fp & operator=(const fp & v) {val = v.val; return *this;}
-	fp & operator=(const float &v) {val = FixedPoint(v).val; return *this;}
-	fp & operator=(const double &v) {val = FixedPoint(v).val; return *this;}
-	fp & operator=(const long double &v) {val = FixedPoint(v).val; return *this;}
-	fp & operator-() {fp p = fp(*this); p.val = -val; return p;}
-	bool operator==(const fp & v) const {return val == v.val;}
-	bool operator!=(const fp & v) const {return val != v.val;}
-
-	void operator+=(const fp & v) {val += v.val;}
-	void operator-=(const fp & v) {val -= v.val;}
-
-	void operator*=(const fp & v) {val = fpi(val *v.val);}
-	void operator/=(const fp & v) {val = fpv(val) / v.val;}
-
-	fp operator+(const fp & v) {fp p = fp(*this); p.val += v.val; return p;}
-	fp operator-(const fp & v) {fp p = fp(*this); p.val -= v.val; return p;}
-
-	fp operator*(const fp & v) {fp p; p.val = fpi(val * v.val); return p;}
-	fp operator/(const fp & v) {fp p; p.val = fpv(val) / v.val; return p;}
-
-	/*fp & operator =(const Type & v) {val = fpv(v); return *this;}
-	bool operator ==(const Type & v) const {val == fpv(v);}
-	bool operator !=(const Type & v) const {val != fpv(v);}
-	void operator +=(const Type & v) {val += fpv(v);}
-	void operator -=(const Type & v) {val -= fpv(v);}
-	void operator *=(const Type & v) {val *= fpv(v);}
-	void operator /=(const Type & v) {val /= fpv(v);}
-	fp operator +(const Type & v) {fp p = fp(*this); p.val += fpv(v); return p;}
-	fp operator -(const Type & v) {fp p = fp(*this); p.val -= fpv(v); return p;}
-	fp operator *(const Type & v) {fp p = fp(*this); p.val *= fpv(v); return p;}
-	fp operator /(const Type & v) {fp p = fp(*this); p.val /= fpv(v); return p;}*/
-
-	Type fpv(Type v) const {return Type(v << Precision);}
-	Type fpi(Type v) const {return Type(v >> Precision);}
-	Type fpc(Type v) const {return v - fpv(fpi(v));}
-	Type val;
-};
-
-template<int Precision, typename Type>
-inline PICout operator <<(PICout s, const FixedPoint<Precision, Type> & v) {
-	s.space(); s.setControl(0, true);
-	if (Precision == 0) s << v.val;
-	else {
-		std::stringstream ss,sr;
-		Type tmp = 10;
-		int n = 1;
-		Type rs = (2 << Precision-1);
-		while(tmp < rs) tmp = tmp*10, n++;
-		tmp *= 10; n++;
-		Type rv = v.fpc(v.val);
-		if (rv != 0) tmp = tmp / (rs / rv);
-		ss << tmp;
-		PIString r = ss.str();
-		if (rv == 0) r.pop_front();
-		else r.expandLeftTo(n,'0');
-		sr << v.fpi(v.val);
-		s << PIString(sr.str()) + "." + r;
-	}
-	s.restoreControl();
-	return s;
-}
-
-
-
-
 //#include "mpint.h"
 //#include "unicode/utypes.h"
 //#include "unicode/stringpiece.h"

src/math/picrypt.cpp

@@ -21,6 +21,7 @@
 #ifdef PIP_CRYPT
 #  include "sodium.h"
 #endif
+const char hash_def_key[] = "_picrypt_";
 
 
 PICrypt::PICrypt() {
@@ -36,9 +37,9 @@ PICrypt::PICrypt() {
 }
 
 
-bool PICrypt::setKey(const PIByteArray & secret) {
+bool PICrypt::setKey(const PIByteArray & _key) {
-	if (secret.size() != key_.size()) return false;
+	if (_key.size() != key_.size()) return false;
-	key_ = secret;
+	key_ = _key;
 	return true;
 }
 
@@ -48,7 +49,7 @@ PIByteArray PICrypt::setKey(const PIString & secret) {
 #ifdef PIP_CRYPT
 	hash.resize(crypto_generichash_BYTES);
 	PIByteArray s(secret.data(), secret.size());
-	crypto_generichash(hash.data(), hash.size(), s.data(), s.size(), 0, 0);
+	crypto_generichash(hash.data(), hash.size(), s.data(), s.size(), (const uchar*)hash_def_key, sizeof(hash_def_key) - 1);
 	hash.resize(key_.size());
 	setKey(hash);
 #endif
@@ -137,7 +138,7 @@ PIByteArray PICrypt::hash(const PIString & secret) {
 	sodium_init();
 	hash.resize(crypto_generichash_BYTES);
 	PIByteArray s(secret.data(), secret.size());
-	crypto_generichash(hash.data(), hash.size(), s.data(), s.size(), 0, 0);
+	crypto_generichash(hash.data(), hash.size(), s.data(), s.size(), (const uchar*)hash_def_key, sizeof(hash_def_key) - 1);
 #endif
 	return hash;
 }

src/math/picrypt.h

@@ -29,7 +29,7 @@ class PICrypt {
 public:
 	PICrypt();
 
-	bool setKey(const PIByteArray & secret);
+	bool setKey(const PIByteArray & key);
 	PIByteArray setKey(const PIString & secret);
 	PIByteArray key() {return key_;}
 	PIByteArray crypt(const PIByteArray & data);