Commit of the new UDP Connection methods and

the rewrite of the retroshare core networking stack.

This check-in commits the changes to the util code.
added some more utility functions for HexToBin & Hashing.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-01-25 06:45:12 +00:00
parent 2780be3931
commit e28c8a846f
3 changed files with 127 additions and 1 deletions

View File

@ -2,7 +2,8 @@
RS_TOP_DIR = ..
include ../make.opt
OBJ = rsthreads.o rsdir.o
OBJ = rsthreads.o rsdir.o rsprint.o
# rsrand.o --- not really needed!
all : $(OBJ) librs dirtest dir2test

View File

@ -0,0 +1,83 @@
/*
* libretroshare/src/util: rsprint.cc
*
* RetroShare Utilities
*
* Copyright 2008 by Robert Fernie.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include "util/rsprint.h"
#include <iomanip>
#include <sstream>
#include <openssl/sha.h>
std::string RsUtil::BinToHex(std::string bin)
{
return BinToHex(bin.c_str(), bin.length());
}
std::string RsUtil::BinToHex(const char *arr, const uint32_t len)
{
std::ostringstream out;
for(uint32_t j = 0; j < len; j++)
{
out << std::hex << std::setw(2) << std::setfill('0') << (int32_t) (((const uint8_t *) arr)[j]);
}
return out.str();
}
std::string RsUtil::HashId(std::string id, bool reverse)
{
std::string hash;
std::string tohash;
if (reverse)
{
std::string::reverse_iterator rit;
for(rit = id.rbegin(); rit != id.rend(); rit++)
{
tohash += (*rit);
}
}
else
{
tohash = id;
}
SHA_CTX *sha_ctx = new SHA_CTX;
uint8_t sha_hash[SHA_DIGEST_LENGTH];
SHA1_Init(sha_ctx);
SHA1_Update(sha_ctx, tohash.c_str(), tohash.length());
SHA1_Final(sha_hash, sha_ctx);
for(uint16_t i = 0; i < SHA_DIGEST_LENGTH; i++)
{
hash += sha_hash[i];
}
/* cleanup */
delete sha_ctx;
return hash;
}

View File

@ -0,0 +1,42 @@
/*
* libretroshare/src/util: rsprint.h
*
* RetroShare Utilities
*
* Copyright 2008 by Robert Fernie.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#ifndef RSUTIL_PRINTFNS_H
#define RSUTIL_PRINTFNS_H
#include <inttypes.h>
#include <string>
namespace RsUtil {
std::string BinToHex(std::string bin);
std::string BinToHex(const char *arr, const uint32_t len);
std::string HashId(std::string id, bool reverse = false);
};
#endif