From 11ef4fab9e2d15126f9d4de1950e710a7e93cc96 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 16 Feb 2014 12:19:34 +0000 Subject: [PATCH] removed old rsid.h git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7121 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/util/rsid.h | 156 ---------------------------------- 1 file changed, 156 deletions(-) delete mode 100644 libretroshare/src/util/rsid.h diff --git a/libretroshare/src/util/rsid.h b/libretroshare/src/util/rsid.h deleted file mode 100644 index 1bb89ad7a..000000000 --- a/libretroshare/src/util/rsid.h +++ /dev/null @@ -1,156 +0,0 @@ -// This class aims at defining a generic ID type that is a list of bytes. It -// can be converted into a hexadecial string for printing, mainly) or for -// compatibility with old methods. -// -// To use this class, derive your own ID type from it. Examples include: -// -// class PGPIdType: public t_RsGenericIdType<8> -// { -// [..] -// }; -// -// class PGPFingerprintType: public t_RsGenericIdType<20> -// { -// [..] -// }; -// -// With this, there is no implicit conversion between subtypes, and therefore ID mixup -// is impossible. -// -// A simpler way to make ID types is to -// typedef t_RsGenericIdType MyType ; -// -// ID Types with different lengths will be incompatible on compilation. -// -// Warning: never store references to a t_RsGenericIdType accross threads, since the -// cached string convertion is not thread safe. -// - -#pragma once -// -//#include -//#include -//#include -//#include -//#include -// -//template class t_RsGenericIdType -//{ -// public: -// t_RsGenericIdType() -// { -// memset(bytes,0,ID_SIZE_IN_BYTES) ; // by default, ids are set to null() -// } -// virtual ~t_RsGenericIdType() {} -// -// // Explicit constructor from a hexadecimal string -// // -// explicit t_RsGenericIdType(const std::string& hex_string) ; -// -// // Explicit constructor from a byte array. The array should have size at least ID_SIZE_IN_BYTES -// // -// explicit t_RsGenericIdType(const unsigned char bytes[]) ; -// -// // Random initialization. Can be useful for testing. -// // -// static t_RsGenericIdType random() -// { -// t_RsGenericIdType id ; -// -// for(uint32_t i=0;i& fp) const { return !memcmp(bytes,fp.bytes,ID_SIZE_IN_BYTES) ; } -// inline bool operator!=(const t_RsGenericIdType& fp) const { return !!memcmp(bytes,fp.bytes,ID_SIZE_IN_BYTES); } -// inline bool operator< (const t_RsGenericIdType& fp) const { return (memcmp(bytes,fp.bytes,ID_SIZE_IN_BYTES) < 0) ; } -// -// inline bool isNull() const -// { -// for(int i=0;i std::string t_RsGenericIdType::toStdString(bool upper_case) const -//{ -// static const char outh[16] = { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' } ; -// static const char outl[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' } ; -// -// std::string res(ID_SIZE_IN_BYTES*2,' ') ; -// -// for(uint32_t j = 0; j < ID_SIZE_IN_BYTES; j++) -// if(upper_case) -// { -// res[2*j ] = outh[ (bytes[j]>>4) ] ; -// res[2*j+1] = outh[ bytes[j] & 0xf ] ; -// } -// else -// { -// res[2*j ] = outl[ (bytes[j]>>4) ] ; -// res[2*j+1] = outl[ bytes[j] & 0xf ] ; -// } -// -// return res ; -//} -// -//template t_RsGenericIdType::t_RsGenericIdType(const std::string& s) -//{ -// int n=0; -// if(s.length() != ID_SIZE_IN_BYTES*2) -// throw std::runtime_error("t_RsGenericIdType<>::t_RsGenericIdType(std::string&): supplied string in constructor has wrong size.") ; -// -// for(uint32_t i = 0; i < ID_SIZE_IN_BYTES; ++i) -// { -// bytes[i] = 0 ; -// -// for(int k=0;k<2;++k) -// { -// char b = s[n++] ; -// -// if(b >= 'A' && b <= 'F') -// bytes[i] += (b-'A'+10) << 4*(1-k) ; -// else if(b >= 'a' && b <= 'f') -// bytes[i] += (b-'a'+10) << 4*(1-k) ; -// else if(b >= '0' && b <= '9') -// bytes[i] += (b-'0') << 4*(1-k) ; -// else -// throw std::runtime_error("t_RsGenericIdType<>::t_RsGenericIdType(std::string&): supplied string is not purely hexadecimal") ; -// } -// } -//} -// -//template t_RsGenericIdType::t_RsGenericIdType(const unsigned char *mem) -//{ -// memcpy(bytes,mem,ID_SIZE_IN_BYTES) ; -//} -// -//static const int SSL_ID_SIZE = 16 ; -//static const int PGP_KEY_ID_SIZE = 8 ; -//static const int PGP_KEY_FINGERPRINT_SIZE = 20 ; -//static const int SHA1_SIZE = 20 ; -// -//// These constants are random, but should be different, in order to make the various IDs incompatible with each other. -//// -//static const uint32_t RS_GENERIC_ID_SSL_ID_TYPE = 0x038439ff ; -//static const uint32_t RS_GENERIC_ID_PGP_ID_TYPE = 0x80339f4f ; -//static const uint32_t RS_GENERIC_ID_SHA1_ID_TYPE = 0x9540284e ; -//static const uint32_t RS_GENERIC_ID_PGP_FINGERPRINT_TYPE = 0x102943e3 ; -// -//typedef t_RsGenericIdType< SSL_ID_SIZE , RS_GENERIC_ID_SSL_ID_TYPE> SSLIdType ; -//typedef t_RsGenericIdType< PGP_KEY_ID_SIZE , RS_GENERIC_ID_PGP_ID_TYPE> PGPIdType; -//typedef t_RsGenericIdType< SHA1_SIZE , RS_GENERIC_ID_SHA1_ID_TYPE> Sha1CheckSum ; -//typedef t_RsGenericIdType< PGP_KEY_FINGERPRINT_SIZE, RS_GENERIC_ID_PGP_FINGERPRINT_TYPE> PGPFingerprintType ; -