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

actions: be helpful on missing ascii-armor option

Browse source 
Refs #4 on github
This commit is contained in:
Mirek Kratochvil 2014-01-24 10:30:13 +01:00
parent 06378a826a
commit f2d1ba9365
3 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/actions.cpp
View file

@ -240,6 +240,9 @@ int action_decrypt (bool armor,
sencode*M = sencode_decode (data); sencode*M = sencode_decode (data);
if (!M) { if (!M) {
err ("error: could not parse input sencode"); err ("error: could not parse input sencode");
if (!armor && envelope_lookalike (data) )
err ("notice: input looks ascii-armored, "
"try using the armor option");
return 1; return 1;
} }
@ -599,6 +602,9 @@ int action_verify (bool armor, const std::string&detach,
sencode*M = sencode_decode (data); sencode*M = sencode_decode (data);
if (!M) { if (!M) {
err ("error: could not parse input sencode"); err ("error: could not parse input sencode");
if (!armor && envelope_lookalike (data) )
err ("notice: input looks ascii-armored, "
"try using the armor option");
return 1; return 1;
} }
@ -821,6 +827,9 @@ int action_decrypt_verify (bool armor, bool yes,
sencode*M = sencode_decode (data); sencode*M = sencode_decode (data);
if (!M) { if (!M) {
err ("error: could not parse input sencode"); err ("error: could not parse input sencode");
if (!armor && envelope_lookalike (data) )
err ("notice: input looks ascii-armored, "
"try using the armor option");
return 1; return 1;
} }
@ -1033,6 +1042,9 @@ int action_import (bool armor, bool no_action, bool yes, bool fp,
sencode*S = sencode_decode (data); sencode*S = sencode_decode (data);
if (!S) { if (!S) {
err ("error: could not parse input sencode"); err ("error: could not parse input sencode");
if (!armor && envelope_lookalike (data) )
err ("notice: input looks ascii-armored, "
"try using the armor option");
return 1; return 1;
} }
@ -1301,6 +1313,9 @@ int action_import_sec (bool armor, bool no_action, bool yes, bool fp,
sencode*S = sencode_decode (data); sencode*S = sencode_decode (data);
if (!S) { if (!S) {
err ("error: could not parse input sencode"); err ("error: could not parse input sencode");
if (!armor && envelope_lookalike (data) )
err ("notice: input looks ascii-armored, "
"try using the armor option");
return 1; return 1;
} }

5
src/envelope.cpp
View file

@ -216,3 +216,8 @@ std::string envelope_format (const std::string&type,
return res; return res;
} }
} }
bool envelope_lookalike (const std::string&data)
{
return data.find ("------ccr begin ") != data.npos;
}

6
src/envelope.h
View file

@ -48,4 +48,10 @@ std::string envelope_format (const std::string&type,
const std::vector<std::string>& parts, const std::vector<std::string>& parts,
prng&rng); prng&rng);
/*
* guesses whether input looks like an envelope
*/
bool envelope_lookalike (const std::string&);
#endif #endif