aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2002-03-04 10:35:34 +0000
committerWerner Koch <[email protected]>2002-03-04 10:35:34 +0000
commitdfda938ee9c0b5de25ccdc1a7b4cdf53e37b4bcb (patch)
tree77a45ed583e54a0537d35ccba2931fe9181837d9
parent* pksign.c (agent_pksign): Detect whether a Smartcard is to be (diff)
downloadgnupg-dfda938ee9c0b5de25ccdc1a7b4cdf53e37b4bcb.tar.gz
gnupg-dfda938ee9c0b5de25ccdc1a7b4cdf53e37b4bcb.zip
Minor fixes; about to release 0.3.1NEWPG-0-3-1
-rw-r--r--assuan/assuan.h3
-rw-r--r--sm/gpgsm.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/assuan/assuan.h b/assuan/assuan.h
index 3c679725f..a9340019f 100644
--- a/assuan/assuan.h
+++ b/assuan/assuan.h
@@ -74,6 +74,9 @@ typedef enum {
ASSUAN_Inquire_Error = 121,
ASSUAN_Invalid_Option = 122,
ASSUAN_Invalid_Index = 123,
+ ASSUAN_Unexpected_Status = 124,
+ ASSUAN_Unexpected_Data = 125,
+ ASSUAN_Invalid_Status = 126,
ASSUAN_Not_Confirmed = 128,
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 7476e6e9a..14c889d66 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -229,7 +229,7 @@ static ARGPARSE_OPTS opts[] = {
{ oAssumeArmor, "assume-armor", 0, N_("assume input is in PEM format")},
{ oAssumeBase64, "assume-base64", 0,
N_("assume input is in base-64 format")},
- { oAssumeBase64, "assume-binary", 0,
+ { oAssumeBinary, "assume-binary", 0,
N_("assume input is in binary format")},
{ oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")},