--- pgp/src/config.c 2018/04/24 16:39:27 1.1.1.3 +++ pgp/src/config.c 2018/04/24 16:40:18 1.1.1.4 @@ -62,8 +62,8 @@ static char optstr[100]; /* option being - All other lines are treated as config options for the program. - Lines may be terminated by either linefeeds, carriage returns, or - carriage return/linefeed pairs (the latter being the DOS default method - of storing text files). + carriage return/linefeed pairs (the latter being the DOS default + method of storing text files). - Config options have the form: @@ -84,7 +84,7 @@ enum MYNAME, TEXTMODE, TMP, TZFIX, VERBOSE, BAKRING, ARMORLINES, COMPLETES_NEEDED, MARGINALS_NEEDED, PAGER, CERT_DEPTH, CHARSET, CLEAR, SELF_ENCRYPT, - INTERACTIVE, + INTERACTIVE, PKCS_COMPAT, /* options below this line can only be used as command line * "long" options */ #define CONFIG_INTRINSICS BATCHMODE @@ -96,7 +96,7 @@ static char *intrinsics[] = "MYNAME", "TEXTMODE", "TMP", "TZFIX", "VERBOSE", "BAKRING", "ARMORLINES", "COMPLETES_NEEDED", "MARGINALS_NEEDED", "PAGER", "CERT_DEPTH", "CHARSET", "CLEARSIG", "ENCRYPTTOSELF", - "INTERACTIVE", + "INTERACTIVE", "PKCS_COMPAT", /* command line only */ "BATCHMODE", "FORCE", }; @@ -106,7 +106,7 @@ static INPUT_TYPE intrinsicType[] = STRING, BOOL, STRING, NUMERIC, NUMERIC, STRING, NUMERIC, NUMERIC, NUMERIC, STRING, NUMERIC, STRING, BOOL, BOOL, - BOOL, + BOOL, NUMERIC, /* command line only */ BOOL, BOOL, }; @@ -323,6 +323,8 @@ static void processAssignment( int intri case TEXTMODE: if( flag ) literal_mode = MODE_TEXT; + else + literal_mode = MODE_BINARY; break; case TMP: @@ -394,6 +396,7 @@ static void processAssignment( int intri case BATCHMODE: batchmode = flag; break; case FORCE: force_flag = flag; break; + case PKCS_COMPAT: pkcs_compat = value; break; } }