--- pgp/src/config.c	2018/04/24 16:40:18	1.1.1.4
+++ pgp/src/config.c	2018/04/24 16:42:25	1.1.1.6
@@ -1,6 +1,23 @@
 /*	config.c  - config file parser by Peter Gutmann
 	Parses config file for PGP
 
+	(c) Copyright 1990-1994 by Philip Zimmermann.  All rights reserved.
+	The author assumes no liability for damages resulting from the use
+	of this software, even if the damage results from defects in this
+	software.  No warranty is expressed or implied.
+
+	Note that while most PGP source modules bear Philip Zimmermann's
+	copyright notice, many of them have been revised or entirely written
+	by contributors who frequently failed to put their names in their
+	code.  Code that has been incorporated into PGP from other authors
+	was either originally published in the public domain or is used with
+	permission from the various authors.
+
+	PGP is available for free to the public under certain restrictions.
+	See the PGP User's Guide (included in the release package) for
+	important information about licensing, patent restrictions on
+	certain algorithms, trademarks, copyrights, and export controls.
+
 	Modified 24 Jun 92 - HAJK
 	Misc fixes for VAX C restrictions.
 
@@ -84,11 +101,12 @@ enum
 	MYNAME, TEXTMODE, TMP, TZFIX, VERBOSE, BAKRING,
 	ARMORLINES, COMPLETES_NEEDED, MARGINALS_NEEDED, PAGER,
 	CERT_DEPTH, CHARSET, CLEAR, SELF_ENCRYPT,
-	INTERACTIVE, PKCS_COMPAT,
+	INTERACTIVE, PKCS_COMPAT, PUBRING, SECRING, RANDSEED,
+	COMMENT,
 	/* options below this line can only be used as command line
 	 * "long" options */
 #define CONFIG_INTRINSICS	BATCHMODE
-	BATCHMODE, FORCE
+	BATCHMODE, FORCE, LEGAL_KLUDGE, NOMANUAL
 };
 
 static char *intrinsics[] =
@@ -96,9 +114,10 @@ static char *intrinsics[] =
 	"MYNAME", "TEXTMODE", "TMP", "TZFIX", "VERBOSE", "BAKRING",
 	"ARMORLINES", "COMPLETES_NEEDED", "MARGINALS_NEEDED", "PAGER",
 	"CERT_DEPTH", "CHARSET", "CLEARSIG", "ENCRYPTTOSELF", 
-	"INTERACTIVE", "PKCS_COMPAT",
+	"INTERACTIVE", "PKCS_COMPAT", "PUBRING", "SECRING", "RANDSEED",
+	"COMMENT",
 	/* command line only */
-	"BATCHMODE", "FORCE",
+	"BATCHMODE", "FORCE", "LEGAL_KLUDGE", "NOMANUAL"
 };
 
 static INPUT_TYPE intrinsicType[] =
@@ -106,9 +125,10 @@ static INPUT_TYPE intrinsicType[] =
 	STRING, BOOL, STRING, NUMERIC, NUMERIC, STRING,
 	NUMERIC, NUMERIC, NUMERIC, STRING,
 	NUMERIC, STRING, BOOL, BOOL,
-	BOOL, NUMERIC,
+	BOOL, NUMERIC, STRING, STRING, STRING,
+	STRING,
 	/* command line only */
-	BOOL, BOOL,
+	BOOL, BOOL, BOOL, BOOL
 };
 
 /* Possible settings for variables */
@@ -131,17 +151,21 @@ static int lookup( char *key, int keyLen
 		key[ indx ] = to_upper( key[ indx ] );
 
 	for( indx = 0; indx < range; indx++ )
-		if( !strncmp( key, keyWords[ indx ], keyLength ) )
-		{	if (strlen(keyWords[indx]) == keyLength)
+		if( !strncmp( key, keyWords[ indx ], keyLength ) ) {
+			if (strlen(keyWords[indx]) == keyLength)
 				return indx;	/* exact match */
 			pos = indx;
 			++matches;
 		}
 	
-	switch (matches)
-	{	case 0: fprintf(stderr, "%s: unknown keyword: \"%s\"\n", errtag, optstr); break;
-		case 1: return pos;
-		default: fprintf(stderr, "%s: \"%s\" is ambiguous\n", errtag, optstr);
+	switch (matches) {
+	  case 0:
+		fprintf(stderr, "%s: unknown keyword: \"%s\"\n", errtag, optstr);
+		break;
+	  case 1:
+		return pos;
+	  default:
+		fprintf(stderr, "%s: \"%s\" is ambiguous\n", errtag, optstr);
 	}
 	return ERROR;
 }
@@ -164,7 +188,7 @@ static int extractToken( char *buffer, i
 	*length = indx - tokenStart;
 
 	/* Return start position of token in buffer */
-	return( tokenStart );
+	return tokenStart;
 }
 
 
@@ -180,35 +204,32 @@ static int getaString( char *buffer, int
 		ch = buffer[ bufIndex++ ];
 
 	/* Check for non-string */
-	if( ch != '\"' )
-		{
+	if( ch != '\"' ) {
 		*endIndex += bufIndex;
 
 		/* Check for special case of null string */
-		if( !ch )
-			{
+		if( !ch ) {
 			*str = '\0';
-			return( OK );
-			}
+			return OK;
+		}
 
 		/* Use nasty non-rigorous string format */
 		noQuote = TRUE;
-		}
+	}
 
 	/* Get first char of string */
 	if( !noQuote )
 		ch = buffer[ bufIndex++ ];
 
 	/* Get string into string */
-	while( ch && ch != '\"' )
-		{
+	while( ch && ch != '\"' ) {
 		/* Exit on '#' if using non-rigorous format */
 		if( noQuote && ch == '#' )
 			break;
 
 		str[ stringIndex++ ] = ch;
 		ch = buffer[ bufIndex++ ];
-		}
+	}
 
 	/* If using the non-rigorous format, stomp trailing spaces */
 	if( noQuote )
@@ -219,20 +240,19 @@ static int getaString( char *buffer, int
 	*endIndex += bufIndex;
 
 	/* Check for missing string terminator */
-	if( ch != '\"' && !noQuote )
-		{
+	if( ch != '\"' && !noQuote ) {
 		if (line)
 			fprintf(stderr, "%s: unterminated string in line %d\n", errtag, line );
 		else
 			fprintf(stderr, "unterminated string: '\"%s'\n", str );
 		hasError = TRUE;
 		errCount++;
-		return( ERROR );
-		}
-
-	return( OK );
+		return ERROR;
 	}
 
+	return OK;
+}
+
 /* Get an assignment to an intrinsic */
 static int getAssignment( char *buffer, int *endIndex, INPUT_TYPE settingType )
 {
@@ -241,171 +261,191 @@ static int getAssignment( char *buffer,
 	buffer += extractToken( buffer, endIndex, &length );
 
 	/* Check for an assignment operator */
-	if ( *buffer != '=' )
-	{
+	if ( *buffer != '=' ) {
 		if (line)
 			fprintf(stderr, "%s: expected '=' in line %d\n", errtag, line );
 		else
 			fprintf(stderr, "%s: expected '=' after \"%s\"\n", errtag, optstr);
 		hasError = TRUE;
 		errCount++;
-		return( ERROR );
+		return ERROR;
 	}
 	buffer++;		/* Skip '=' */
 
 	buffer += extractToken( buffer, endIndex, &length );
 
-	switch( settingType )
-	{
-		case BOOL:
-			/* Check for known intrinsic - really more general than just
-			   checking for TRUE or FALSE */
-			if( ( settingIndex = lookup( buffer, length, settings, NO_SETTINGS ) ) == ERROR )
-			{
-				hasError = TRUE;
-				errCount++;
-				return( ERROR );
-			}
-
-			flag = ( settingIndex == 0 ) ? FALSE : TRUE;
-			break;
+	switch( settingType ) {
+	  case BOOL:
+		/* Check for known intrinsic - really more general than just
+		   checking for TRUE or FALSE */
+		if( ( settingIndex = lookup( buffer, length, settings, NO_SETTINGS ) ) == ERROR )
+		{
+			hasError = TRUE;
+			errCount++;
+			return ERROR;
+		}
 
-		case STRING:
-			/* Get a string */
-			getaString( buffer, &length );
-			break;
+		flag = ( settingIndex == 0 ) ? FALSE : TRUE;
+		break;
 
-		case NUMERIC:
-			/* Get numeric input.  Error checking is a pain since atoi()
-				has no real equivalent of NAN */
-			value = atoi( buffer );
-			break;
+	  case STRING:
+		/* Get a string */
+		getaString( buffer, &length );
+		break;
+
+	  case NUMERIC:
+		/* Get numeric input.  Error checking is a pain since atoi()
+			has no real equivalent of NAN */
+		value = atoi( buffer );
+		break;
 	}
 
-	return( settingIndex );
+	return settingIndex;
 }
 
 /* Process an assignment */
 
 static void processAssignment( int intrinsicIndex )
-	{
+{
 	if( !hasError )
-		switch( intrinsicIndex )
-			{
-			case ARMOR:
-				emit_radix_64 = flag;
-				break;
+		switch( intrinsicIndex ) {
+		  case ARMOR:
+			emit_radix_64 = flag;
+			break;
 
-			case COMPRESS:
-				compress_enabled = flag;
-				break;
+		  case COMPRESS:
+			compress_enabled = flag;
+			break;
 
-			case SHOWPASS:
-				showpass = flag;
-				break;
+		  case SHOWPASS:
+			showpass = flag;
+			break;
 
-			case KEEPBINARY:
-				keepctx = flag;
-				break;
+		  case KEEPBINARY:
+			keepctx = flag;
+			break;
 
-			case LANGUAGE:
-				strncpy(language, str, 15);
-				break;
+		  case LANGUAGE:
+			strncpy(language, str, 15);
+			break;
 
-			case BAKRING:
-				strcpy(floppyring, str);
-				break;
+		  case BAKRING:
+			strcpy(floppyring, str);
+			break;
 
-			case MYNAME:
-				strcpy(my_name, str);
-				break;
+		  case MYNAME:
+			strcpy(my_name, str);
+			break;
 
-			case TEXTMODE:
-				if( flag )
-					literal_mode = MODE_TEXT;
-				else
-					literal_mode = MODE_BINARY;
-				break;
+		  case TEXTMODE:
+			if( flag )
+				literal_mode = MODE_TEXT;
+			else
+				literal_mode = MODE_BINARY;
+			break;
 
-			case TMP:
-				/* directory pathname to store temp files */
-				settmpdir(str);
-				break;
+		  case TMP:
+			/* directory pathname to store temp files */
+			settmpdir(str);
+			break;
 
-			case TZFIX:
-				/* How many hours to add to time() to get GMT. */
-				/* Compute seconds from hours to shift to GMT: */
-				timeshift = 3600L * (long) value;
-				break;
+		  case TZFIX:
+			/* How many hours to add to time() to get GMT. */
+			/* Compute seconds from hours to shift to GMT: */
+			timeshift = 3600L * (long) value;
+			break;
 
-			case VERBOSE:
-				switch (value)
-				{
-					case 0: quietmode = TRUE; verbose = FALSE; break;
-					case 1: quietmode = FALSE; verbose = FALSE; break;
-					case 2: quietmode = FALSE; verbose = TRUE; break;
-					default: quietmode = FALSE; verbose = FALSE;
-				}
-				break;
+		  case VERBOSE:
+			if (value < 1) {
+				quietmode = TRUE; verbose = FALSE;
+			} else if (value == 1) {
+				quietmode = FALSE; verbose = FALSE;
+			} else {	/* value > 1 */
+				quietmode = FALSE; verbose = TRUE;
+			}
+			break;
 
-			case ARMORLINES:
-				pem_lines = value;
-				break;
+		  case ARMORLINES:
+			pem_lines = value;
+			break;
 
-			case MARGINALS_NEEDED:
-				marg_min = value;
-				if (marg_min < 1)
-					marg_min = 1;
-				break;
+		  case MARGINALS_NEEDED:
+			marg_min = value;
+			if (marg_min < 1)
+				marg_min = 1;
+			break;
 
-			case COMPLETES_NEEDED:
-				compl_min = value;
-				if (compl_min < 1)
-					compl_min = 1;
-				if (compl_min > 4)
-					compl_min = 4;
-				break;
+		  case COMPLETES_NEEDED:
+			compl_min = value;
+			if (compl_min < 1)
+				compl_min = 1;
+			if (compl_min > 4)
+				compl_min = 4;
+			break;
 
-			case CERT_DEPTH:
-				max_cert_depth = value;
-				if (max_cert_depth < 0)
-					max_cert_depth = 0;
-				if (max_cert_depth > 8)
-					max_cert_depth = 8;
-				break;
+		  case CERT_DEPTH:
+			max_cert_depth = value;
+			if (max_cert_depth < 0)
+				max_cert_depth = 0;
+			if (max_cert_depth > 8)
+				max_cert_depth = 8;
+			break;
 
-			case PAGER:
-				strcpy(pager, str);
-				break;
+		  case PAGER:
+			strcpy(pager, str);
+			break;
 
-			case CHARSET:
-				strcpy(charset, str);
-				break;
+		  case CHARSET:
+			strcpy(charset, str);
+			break;
 
-			case CLEAR:
-				clear_signatures = flag;
-				break;
-				
-			case SELF_ENCRYPT:
-				encrypt_to_self = flag;
-				break;
-				
-			case INTERACTIVE:
-				interactive_add = flag;
-				break;
-				
-			case BATCHMODE: batchmode = flag; break;
-			case FORCE: force_flag = flag; break;
-			case PKCS_COMPAT: pkcs_compat = value; break;
-			}
-	}
+		  case CLEAR:
+			clear_signatures = flag;
+			break;
+			
+		  case SELF_ENCRYPT:
+			encrypt_to_self = flag;
+			break;
+			
+		  case INTERACTIVE:
+			interactive_add = flag;
+			break;
+			
+		  case BATCHMODE: batchmode = flag; break;
+		  case FORCE: force_flag = flag; break;
+		  case PKCS_COMPAT: pkcs_compat = value; break;
+
+		/* Undocumented flag to test contractually-mandated time bomb */
+		  case LEGAL_KLUDGE:
+			legal_kludge = value;
+			break;
+
+		  case NOMANUAL: nomanual = value; break;
+
+		  case PUBRING:
+			strcpy(globalPubringName, str);
+			break;
+
+		  case SECRING:
+			strcpy(globalSecringName, str);
+			break;
+
+		  case RANDSEED:
+			strcpy(globalRandseedName, str);
+			break;
+
+		  case COMMENT:
+			strcpy(globalCommentString, str);
+			break;
+		}
+}
 
 /* Process an option on a line by itself.  This expects options which are
    taken from the command-line, and is less finicky about errors than the
    config-file version */
 
 int processConfigLine( char *option )
-	{
+{
 	int indx, intrinsicIndex;
 	char ch;
 
@@ -421,15 +461,15 @@ int processConfigLine( char *option )
 	if( ( intrinsicIndex = lookup( ( char * ) option, indx, intrinsics, NO_INTRINSICS ) ) == ERROR )
 		return -1;
 	if (option[indx] == '\0' && intrinsicType[intrinsicIndex] == BOOL)
-	{	/* boolean option, no '=' means TRUE */
+	{
+		/* boolean option, no '=' means TRUE */
 		flag = TRUE;
 		processAssignment(intrinsicIndex);
-	}
-	else /* Get the value to set to, either as a string, a
+	} else /* Get the value to set to, either as a string, a
 		    numeric value, or a boolean flag */
 		if (getAssignment( ( char * ) option + indx, &indx, intrinsicType[ intrinsicIndex ] ) != ERROR)
 			processAssignment( intrinsicIndex );
-	return(errCount ? -1 : 0);
+	return errCount ? -1 : 0;
 }
 
 /* Process a config file */
@@ -445,15 +485,13 @@ int processConfigFile( char *configFileN
 	errCount = 0;
 	errtag = "config.txt";
 
-	if( ( configFilePtr = fopen( configFileName, FOPRTXT ) ) == NULL )
-	{
+	if( ( configFilePtr = fopen( configFileName, FOPRTXT ) ) == NULL ) {
 		fprintf(stderr, "Cannot open configuration file %s\n", configFileName );
-		return( OK );	/* treat like empty config file */
+		return OK;	/* treat like empty config file */
 	}
 
 	/* Process each line in the configFile */
-	while( ch != EOF )
-	{
+	while( ch != EOF ) {
 		/* Skip whitespace */
 		while( ( ( ch = getc( configFilePtr ) ) == ' ' || ch == '\t' ) && ch != EOF )
 		;
@@ -502,35 +540,33 @@ int processConfigFile( char *configFileN
 		{
 			switch( errType )
 			{
-				case LINELENGTH_ERROR:
-					fprintf(stderr, "%s: line '%.30s...' too long\n", errtag, inBuffer );
-					errCount++;
-					break;
+			  case LINELENGTH_ERROR:
+				fprintf(stderr, "%s: line '%.30s...' too long\n", errtag, inBuffer );
+				errCount++;
+				break;
 
-				case ILLEGAL_CHAR_ERROR:
-					fprintf(stderr, "> %s\n  ", inBuffer );
-					fprintf(stderr, "%*s^\n", errPos, ""); 
-					fprintf(stderr, "%s: bad character in command on line %d\n", errtag, line );
-					errCount++;
-					break;
+			  case ILLEGAL_CHAR_ERROR:
+				fprintf(stderr, "> %s\n  ", inBuffer );
+				fprintf(stderr, "%*s^\n", errPos, ""); 
+				fprintf(stderr, "%s: bad character in command on line %d\n", errtag, line );
+				errCount++;
+				break;
 
-				default:
-					for( indx = 0;
-						 indx < LINEBUF_SIZE && ( ch = inBuffer[ indx ] ) != '\0'
-								&& ch != ' ' && ch != '\t' && ch != '=';
-						 indx++ )
-						 	;
-					if( ( intrinsicIndex = lookup( inBuffer, indx, intrinsics, CONFIG_INTRINSICS ) ) == ERROR )
-					{
-						errCount++;
-					}
-					else
-					{
-						/* Get the value to set to, either as a string, a
-						   numeric value, or a boolean flag */
-						getAssignment( inBuffer + indx, &indx, intrinsicType[ intrinsicIndex ] );
-						processAssignment( intrinsicIndex );
-					}
+			  default:
+				for( indx = 0;
+					 indx < LINEBUF_SIZE && ( ch = inBuffer[ indx ] ) != '\0'
+							&& ch != ' ' && ch != '\t' && ch != '=';
+					 indx++ )
+						;
+				if( ( intrinsicIndex = lookup( inBuffer, indx, intrinsics, CONFIG_INTRINSICS ) ) == ERROR )
+				{
+					errCount++;
+				} else {
+					/* Get the value to set to, either as a string, a
+					   numeric value, or a boolean flag */
+					getAssignment( inBuffer + indx, &indx, intrinsicType[ intrinsicIndex ] );
+					processAssignment( intrinsicIndex );
+				}
 			}
 		}
 
@@ -548,12 +584,11 @@ int processConfigFile( char *configFileN
 	fclose( configFilePtr );
 
 	/* Exit if there were errors */
-	if( errCount )
-	{
+	if( errCount ) {
 		fprintf(stderr, "%s: %s%d error(s) detected\n\n", configFileName, ( errCount >= MAX_ERRORS ) ?
 				"Maximum level of " : "", errCount );
-		return( ERROR );
+		return ERROR;
 	}
 
-	return( OK );
+	return OK;
 }