exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

sencode: a little better format of decode

Browse source 
It's not all that pointy anymore.
This commit is contained in:
Mirek Kratochvil 2013-04-20 10:09:11 +02:00
parent 6b96cc33e6
commit bf57a99fb2
3 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/keyring.cpp
View file

@ -134,9 +134,12 @@ bool keyring::parse_keypairs (sencode*keypairs, keypair_storage&pairs)
std::string keyid = get_keyid (pubkey->b); std::string keyid = get_keyid (pubkey->b);
sencode *priv, *pub; sencode *priv, *pub;
if (!sencode_decode (privkey->b, &priv) )
goto failure; priv = sencode_decode (privkey->b);
if (!sencode_decode (pubkey->b, &pub) ) { if (!priv) goto failure;
pub = sencode_decode (pubkey->b);
if (!pub) {
sencode_destroy (priv); sencode_destroy (priv);
goto failure; goto failure;
} }
@ -191,8 +194,8 @@ bool keyring::parse_pubkeys (sencode* pubkeys, pubkey_storage&pubs)
std::string keyid = get_keyid (pubkey->b); std::string keyid = get_keyid (pubkey->b);
sencode*key; sencode*key;
if (!sencode_decode (pubkey->b, &key) ) key = sencode_decode (pubkey->b);
goto failure; if (!key) goto failure;
pubs[keyid] = pubkey_entry (keyid, ident->b, key); pubs[keyid] = pubkey_entry (keyid, ident->b, key);
} }
@ -303,30 +306,27 @@ static bool prepare_user_dir (const std::string&dir)
ensure_empty_sencode_file (dir + SECRETS_FILENAME); ensure_empty_sencode_file (dir + SECRETS_FILENAME);
} }
static bool file_get_sencode (const std::string&fn, sencode**out) static sencode* file_get_sencode (const std::string&fn)
{ {
//check whether it is a file first //check whether it is a file first
struct stat st; struct stat st;
if (stat (fn.c_str(), &st) ) if (stat (fn.c_str(), &st) )
return false; return NULL;
if (!S_ISREG (st.st_mode) ) if (!S_ISREG (st.st_mode) )
return false; return NULL;
//not we got the size, prepare buffer space //not we got the size, prepare buffer space
std::string data; std::string data;
data.resize (st.st_size, 0); data.resize (st.st_size, 0);
std::ifstream in (fn.c_str(), std::ios::in | std::ios::binary); std::ifstream in (fn.c_str(), std::ios::in | std::ios::binary);
if (!in) return false; if (!in) return NULL;
in.read (&data[0], st.st_size); in.read (&data[0], st.st_size);
in.close(); in.close();
//and decode it //and decode it
if (!sencode_decode (data, out) ) return sencode_decode (data);
return false;
return true;
} }
static bool file_put_sencode (const std::string&fn, sencode*in) static bool file_put_sencode (const std::string&fn, sencode*in)
@ -353,9 +353,9 @@ bool keyring::load()
* pubkeys loading * pubkeys loading
*/ */
fn = dir + PUBKEYS_FILENAME; fn = dir + PUBKEYS_FILENAME;
sencode* pubkeys;
if (!file_get_sencode (fn, &pubkeys) ) sencode* pubkeys = file_get_sencode (fn);
return false; if (!pubkeys) return false;
res = parse_pubkeys (pubkeys, pubs); res = parse_pubkeys (pubkeys, pubs);
sencode_destroy (pubkeys); sencode_destroy (pubkeys);
@ -366,9 +366,9 @@ bool keyring::load()
* keypairs loading * keypairs loading
*/ */
fn = dir + SECRETS_FILENAME; fn = dir + SECRETS_FILENAME;
sencode*keypairs;
if (!file_get_sencode (fn, &keypairs) ) sencode*keypairs = file_get_sencode (fn);
return false; if (!keypairs) return false;
res = parse_keypairs (keypairs, pairs); res = parse_keypairs (keypairs, pairs);
sencode_destroy (keypairs); sencode_destroy (keypairs);

7
src/sencode.cpp
View file

@ -81,7 +81,7 @@ fail:
pos = -1; pos = -1;
} }
bool sencode_decode (const std::string& str, sencode**out) sencode* sencode_decode (const std::string& str)
{ {
std::list<sencode*> stk; std::list<sencode*> stk;
int pos = 0; int pos = 0;
@ -126,8 +126,7 @@ bool sencode_decode (const std::string& str, sencode**out)
se->items.push_back (tos); se->items.push_back (tos);
stk.pop_back(); stk.pop_back();
} else if (pos + 1 == len) { } else if (pos + 1 == len) {
*out = stk.front(); return stk.front();
return true;
} }
} }
@ -137,7 +136,7 @@ bool sencode_decode (const std::string& str, sencode**out)
i != e; ++i) i != e; ++i)
sencode_destroy (*i); sencode_destroy (*i);
return false; return NULL;
} }
void sencode_destroy (sencode*x) void sencode_destroy (sencode*x)

2
src/sencode.h
View file

@ -35,7 +35,7 @@ public:
virtual void destroy() {} virtual void destroy() {}
}; };
bool sencode_decode (const std::string&, sencode**); sencode* sencode_decode (const std::string&);
void sencode_destroy (sencode*); void sencode_destroy (sencode*);
class sencode_list: public sencode class sencode_list: public sencode