Remove unused code in libzerocash util.cpp
This commit is contained in:
Taylor Hornby
@@ -12,142 +12,14 @@
|
||||
|
||||
namespace libzerocash {
|
||||
|
||||
void printChar(const unsigned char c) {
|
||||
for(int j = 8; j >= 0; j--) {
|
||||
std::cout << ((c >> j) & 1);
|
||||
}
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
void printVector(const std::vector<bool>& v) {
|
||||
std::cout << v.size() << " MSB ";
|
||||
for(size_t i = 0; i < v.size(); i++) {
|
||||
std::cout << v.at(i);
|
||||
}
|
||||
std::cout << " LSB" << std::endl;
|
||||
}
|
||||
|
||||
void printVector(const std::string str, const std::vector<bool>& v) {
|
||||
std::cout << str << " " << v.size() << " MSB ";
|
||||
for(size_t i = 0; i < v.size(); i++) {
|
||||
std::cout << v.at(i);
|
||||
}
|
||||
std::cout << " LSB" << std::endl;
|
||||
}
|
||||
|
||||
void printVectorAsHex(const std::vector<bool>& v) {
|
||||
unsigned char bytes[int(v.size() / 8)];
|
||||
convertVectorToBytes(v, bytes);
|
||||
|
||||
for(int i = 0; i < int(v.size() / 8); i++) {
|
||||
std::cout << std::setw(2) << std::setfill('0') << std::hex << (int) bytes[i];
|
||||
}
|
||||
std::cout << std::dec << std::endl;
|
||||
}
|
||||
|
||||
void printVectorAsHex(const std::string str, const std::vector<bool>& v) {
|
||||
unsigned char bytes[int(v.size() / 8)];
|
||||
convertVectorToBytes(v, bytes);
|
||||
|
||||
std::cout << str << " ";
|
||||
for(int i = 0; i < int(v.size() / 8); i++) {
|
||||
std::cout << std::setw(2) << std::setfill('0') << std::hex << (int) bytes[i];
|
||||
}
|
||||
std::cout << std::dec << std::endl;
|
||||
}
|
||||
|
||||
void printBytesVector(const std::vector<unsigned char>& v) {
|
||||
std::vector<bool> boolVec(v.size() * 8);
|
||||
convertBytesVectorToVector(v, boolVec);
|
||||
printVector(boolVec);
|
||||
}
|
||||
|
||||
void printBytesVector(const std::string str, const std::vector<unsigned char>& v) {
|
||||
std::vector<bool> boolVec(v.size() * 8);
|
||||
convertBytesVectorToVector(v, boolVec);
|
||||
printVector(str, boolVec);
|
||||
}
|
||||
|
||||
void printBytesVectorAsHex(const std::vector<unsigned char>& v) {
|
||||
std::vector<bool> boolVec(v.size() * 8);
|
||||
convertBytesVectorToVector(v, boolVec);
|
||||
printVectorAsHex(boolVec);
|
||||
}
|
||||
|
||||
void printBytesVectorAsHex(const std::string str, const std::vector<unsigned char>& v) {
|
||||
std::vector<bool> boolVec(v.size() * 8);
|
||||
convertBytesVectorToVector(v, boolVec);
|
||||
printVectorAsHex(str, boolVec);
|
||||
}
|
||||
|
||||
void getRandBytes(unsigned char* bytes, int num) {
|
||||
randombytes_buf(bytes, num);
|
||||
}
|
||||
|
||||
void convertBytesToVector(const unsigned char* bytes, std::vector<bool>& v) {
|
||||
int numBytes = v.size() / 8;
|
||||
unsigned char c;
|
||||
for(int i = 0; i < numBytes; i++) {
|
||||
c = bytes[i];
|
||||
|
||||
for(int j = 0; j < 8; j++) {
|
||||
v.at((i*8)+j) = ((c >> (7-j)) & 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void convertVectorToBytes(const std::vector<bool>& v, unsigned char* bytes) {
|
||||
int numBytes = v.size() / 8;
|
||||
unsigned char c = '\0';
|
||||
|
||||
for(int i = 0; i < numBytes; i++) {
|
||||
c = '\0';
|
||||
for(int j = 0; j < 8; j++) {
|
||||
if(j == 7)
|
||||
c = ((c | v.at((i*8)+j)));
|
||||
else
|
||||
c = ((c | v.at((i*8)+j)) << 1);
|
||||
}
|
||||
bytes[i] = c;
|
||||
}
|
||||
}
|
||||
|
||||
void convertBytesToBytesVector(const unsigned char* bytes, std::vector<unsigned char>& v) {
|
||||
for(size_t i = 0; i < v.size(); i++) {
|
||||
v.at(i) = bytes[i];
|
||||
}
|
||||
}
|
||||
|
||||
void convertBytesVectorToBytes(const std::vector<unsigned char>& v, unsigned char* bytes) {
|
||||
for(size_t i = 0; i < v.size(); i++) {
|
||||
bytes[i] = v.at(i);
|
||||
}
|
||||
}
|
||||
|
||||
void convertBytesVectorToVector(const std::vector<unsigned char>& bytes, std::vector<bool>& v) {
|
||||
v.resize(bytes.size() * 8);
|
||||
unsigned char bytesArr[bytes.size()];
|
||||
convertBytesVectorToBytes(bytes, bytesArr);
|
||||
convertBytesToVector(bytesArr, v);
|
||||
}
|
||||
|
||||
void convertVectorToBytesVector(const std::vector<bool>& v, std::vector<unsigned char>& bytes) {
|
||||
unsigned char bytesArr[int(ceil(v.size() / 8.))];
|
||||
convertVectorToBytes(v, bytesArr);
|
||||
convertBytesToBytesVector(bytesArr, bytes);
|
||||
}
|
||||
|
||||
void convertIntToBytesVector(const uint64_t val_int, std::vector<unsigned char>& bytes) {
|
||||
for(size_t i = 0; i < bytes.size(); i++) {
|
||||
bytes[bytes.size()-1-i] = (val_int >> (i * 8));
|
||||
}
|
||||
}
|
||||
|
||||
void convertIntToVector(uint64_t val, std::vector<bool>& v)
|
||||
{
|
||||
v.resize(64);
|
||||
for(unsigned int i = 0; i < 64; ++i, val >>= 1) {
|
||||
v.at(63 - i) = val & 0x01;
|
||||
v.resize(bytes.size() * 8);
|
||||
unsigned char c;
|
||||
for (size_t i = 0; i < bytes.size(); i++) {
|
||||
c = bytes.at(i);
|
||||
for (size_t j = 0; j < 8; j++) {
|
||||
v.at((i*8)+j) = (c >> (7-j)) & 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -166,176 +38,5 @@ uint64_t convertVectorToInt(const std::vector<bool>& v) {
|
||||
return result;
|
||||
}
|
||||
|
||||
uint64_t convertBytesVectorToInt(const std::vector<unsigned char>& bytes) {
|
||||
uint64_t val_int = 0;
|
||||
|
||||
for(size_t i = 0; i < bytes.size(); i++) {
|
||||
val_int = val_int + (((uint64_t)bytes[i]) << ((bytes.size()-1-i) * 8));
|
||||
}
|
||||
|
||||
return val_int;
|
||||
}
|
||||
|
||||
void concatenateVectors(const std::vector<bool>& A, const std::vector<bool>& B, std::vector<bool>& result) {
|
||||
result.reserve(A.size() + B.size());
|
||||
result.insert(result.end(), A.begin(), A.end());
|
||||
result.insert(result.end(), B.begin(), B.end());
|
||||
}
|
||||
|
||||
void concatenateVectors(const std::vector<unsigned char>& A, const std::vector<unsigned char>& B, std::vector<unsigned char>& result) {
|
||||
result.reserve(A.size() + B.size());
|
||||
result.insert(result.end(), A.begin(), A.end());
|
||||
result.insert(result.end(), B.begin(), B.end());
|
||||
}
|
||||
|
||||
void concatenateVectors(const std::vector<bool>& A, const std::vector<bool>& B, const std::vector<bool>& C, std::vector<bool>& result) {
|
||||
result.reserve(A.size() + B.size() + C.size());
|
||||
result.insert(result.end(), A.begin(), A.end());
|
||||
result.insert(result.end(), B.begin(), B.end());
|
||||
result.insert(result.end(), C.begin(), C.end());
|
||||
}
|
||||
|
||||
void concatenateVectors(const std::vector<unsigned char>& A, const std::vector<unsigned char>& B, const std::vector<unsigned char>& C, std::vector<unsigned char>& result) {
|
||||
result.reserve(A.size() + B.size() + C.size());
|
||||
result.insert(result.end(), A.begin(), A.end());
|
||||
result.insert(result.end(), B.begin(), B.end());
|
||||
result.insert(result.end(), C.begin(), C.end());
|
||||
}
|
||||
|
||||
void sha256(const unsigned char* input, unsigned char* hash, int len) {
|
||||
CSHA256 hasher;
|
||||
hasher.Write(input, len);
|
||||
hasher.FinalizeNoPadding(hash);
|
||||
}
|
||||
|
||||
void sha256(CSHA256& hasher, const unsigned char* input, unsigned char* hash, int len) {
|
||||
// Ignore the one that's passed in; this optimization is useless
|
||||
// for all of our code, and this code is all being removed anyway.
|
||||
CSHA256 new_hasher;
|
||||
new_hasher.Write(input, len);
|
||||
new_hasher.FinalizeNoPadding(hash);
|
||||
}
|
||||
|
||||
void hashVector(CSHA256& hasher, const std::vector<bool> input, std::vector<bool>& output) {
|
||||
int size = int(input.size() / 8);
|
||||
unsigned char bytes[size];
|
||||
convertVectorToBytes(input, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(hasher, bytes, hash, (int)size);
|
||||
|
||||
convertBytesToVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVector(CSHA256& hasher, const std::vector<unsigned char> input, std::vector<unsigned char>& output) {
|
||||
int size = int(input.size());
|
||||
unsigned char bytes[size];
|
||||
convertBytesVectorToBytes(input, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(hasher, bytes, hash, (int)size);
|
||||
|
||||
convertBytesToBytesVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVector(const std::vector<bool> input, std::vector<bool>& output) {
|
||||
CSHA256 hasher;
|
||||
|
||||
int size = int(input.size() / 8);
|
||||
unsigned char bytes[size];
|
||||
convertVectorToBytes(input, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(hasher, bytes, hash, (int)size);
|
||||
|
||||
convertBytesToVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVector(const std::vector<unsigned char> input, std::vector<unsigned char>& output) {
|
||||
CSHA256 hasher;
|
||||
|
||||
int size = int(input.size());
|
||||
unsigned char bytes[size];
|
||||
convertBytesVectorToBytes(input, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(hasher, bytes, hash, (int)size);
|
||||
|
||||
convertBytesToBytesVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVectors(CSHA256& hasher, const std::vector<bool> left, const std::vector<bool> right, std::vector<bool>& output) {
|
||||
std::vector<bool> concat;
|
||||
concatenateVectors(left, right, concat);
|
||||
|
||||
int size = int(concat.size() / 8);
|
||||
unsigned char bytes[size];
|
||||
convertVectorToBytes(concat, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(hasher, bytes, hash, (int)size);
|
||||
|
||||
convertBytesToVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVectors(CSHA256& hasher, const std::vector<unsigned char> left, const std::vector<unsigned char> right, std::vector<unsigned char>& output) {
|
||||
std::vector<unsigned char> concat;
|
||||
concatenateVectors(left, right, concat);
|
||||
|
||||
int size = int(concat.size());
|
||||
unsigned char bytes[size];
|
||||
convertBytesVectorToBytes(concat, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(hasher, bytes, hash, (int)size);
|
||||
|
||||
convertBytesToBytesVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVectors(const std::vector<bool> left, const std::vector<bool> right, std::vector<bool>& output) {
|
||||
std::vector<bool> concat;
|
||||
concatenateVectors(left, right, concat);
|
||||
|
||||
int size = int(concat.size() / 8);
|
||||
unsigned char bytes[size];
|
||||
convertVectorToBytes(concat, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(bytes, hash, (int)size);
|
||||
|
||||
convertBytesToVector(hash, output);
|
||||
}
|
||||
|
||||
void hashVectors(const std::vector<unsigned char> left, const std::vector<unsigned char> right, std::vector<unsigned char>& output) {
|
||||
std::vector<unsigned char> concat;
|
||||
concatenateVectors(left, right, concat);
|
||||
|
||||
int size = int(concat.size());
|
||||
unsigned char bytes[size];
|
||||
convertBytesVectorToBytes(concat, bytes);
|
||||
|
||||
unsigned char hash[CSHA256::OUTPUT_SIZE];
|
||||
sha256(bytes, hash, (int)size);
|
||||
|
||||
convertBytesToBytesVector(hash, output);
|
||||
}
|
||||
|
||||
bool VectorIsZero(const std::vector<bool> test) {
|
||||
// XXX: not time safe
|
||||
return (test.end() == std::find(test.begin(), test.end(), true));
|
||||
}
|
||||
|
||||
size_t countOnes(const std::vector<bool>& vec) {
|
||||
return count(vec.begin(), vec.end(), true);
|
||||
}
|
||||
|
||||
std::vector<unsigned char> vectorSlice(const std::vector<unsigned char>& vec, size_t start, size_t length) {
|
||||
std::vector<unsigned char> slice(length);
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
slice.at(i) = vec.at(start + i);
|
||||
}
|
||||
return slice;
|
||||
}
|
||||
|
||||
} /* namespace libzerocash */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user