Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

loop over available searchKeys #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

loop over available searchKeys #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions Backup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,26 +159,29 @@ bool Kangaroo::LoadWork(string &fileName) {
return false;

keysToSearch.clear();
Point key;
int keyCount = 0;

// Read global param
uint32_t dp;
::fread(&dp,sizeof(uint32_t),1,fRead);
if(initDPSize < 0) initDPSize = dp;
::fread(&rangeStart.bits64,32,1,fRead); rangeStart.bits64[4] = 0;
::fread(&rangeEnd.bits64,32,1,fRead); rangeEnd.bits64[4] = 0;
::fread(&keyCount,sizeof(int),1,fRead);
for(int i = 0; i < keyCount; i++){
Point key;
::fread(&key.x.bits64,32,1,fRead); key.x.bits64[4] = 0;
::fread(&key.y.bits64,32,1,fRead); key.y.bits64[4] = 0;
::fread(&offsetCount,sizeof(uint64_t),1,fRead);
::fread(&offsetTime,sizeof(double),1,fRead);

key.z.SetInt32(1);
if(!secp->EC(key)) {
::printf("LoadWork: key does not lie on elliptic curve\n");
return false;
}

key.z.SetInt32(1);
keysToSearch.push_back(key);
}
::fread(&offsetCount,sizeof(uint64_t),1,fRead);
::fread(&offsetTime,sizeof(double),1,fRead);

::printf("Start:%s\n",rangeStart.GetBase16().c_str());
::printf("Stop :%s\n",rangeEnd.GetBase16().c_str());
Expand Down Expand Up @@ -378,13 +381,16 @@ bool Kangaroo::SaveHeader(string fileName,FILE* f,int type,uint64_t totalCount,d
::fwrite(&version,sizeof(uint32_t),1,f);

if(type==HEADW) {

int keyCount = (int)keysToSearch.size();
// Save global param
::fwrite(&dpSize,sizeof(uint32_t),1,f);
::fwrite(&rangeStart.bits64,32,1,f);
::fwrite(&rangeEnd.bits64,32,1,f);
::fwrite(&keysToSearch[keyIdx].x.bits64,32,1,f);
::fwrite(&keysToSearch[keyIdx].y.bits64,32,1,f);
::fwrite(&keyCount,sizeof(int),1,f);
for(int i = 0; i < keyCount; i++){
::fwrite(&keysToSearch[i].x.bits64,32,1,f);
::fwrite(&keysToSearch[i].y.bits64,32,1,f);
}
::fwrite(&totalCount,sizeof(uint64_t),1,f);
::fwrite(&totalTime,sizeof(double),1,f);

Expand Down
2 changes: 1 addition & 1 deletion Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define CONSTANTSH

// Release number
#define RELEASE "2.2"
#define RELEASE "2.2.1"

// Use symmetry
//#define USE_SYMMETRY
Expand Down