--- pgp/src/passwd.c	2018/04/24 16:42:24	1.1.1.6
+++ pgp/src/passwd.c	2018/04/24 16:45:35	1.1.1.8
@@ -1,96 +1,108 @@
-/*	passwd.c - Password reading/hashing routines
-	Implemented in Microsoft C.
-	Routines for getting a pass phrase from the user's console.
-
-	(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.
-*/
-
-#include	<stdio.h>	/* for fprintf() */
-#include	<ctype.h>	/* for isdigit(), toupper(), etc. */
-#include	<string.h>	/* for strlen() */
-
-#include	"random.h"	/* for getstring() */
-#include	"md5.h"
-#include	"language.h"
-#include	"pgp.h"
-
-#define MAXKEYLEN 254	/* max byte length of pass phrase */
-
-boolean showpass = FALSE;
-
-/*
-**	hashpass - Hash pass phrase down to 128 bits (16 bytes).
-**  keylen must be less than 1024.
-**	Use the MD5 algorithm.
-*/
-void hashpass (char *keystring, int keylen, byte *hash)
-{
-	struct MD5Context mdContext;
-
-	/* Calculate the hash */
-	MD5Init(&mdContext);
-	MD5Update(&mdContext, (unsigned char *) keystring, keylen);
-	MD5Final(hash, &mdContext);
-} /* hashpass */
-
-
-/*
-**	GetHashedPassPhrase - get pass phrase from user,
-		 hashes it to an IDEA key.
-	Parameters:
-		returns char *keystring as the pass phrase itself
-		return char *hash as the 16-byte hash of the pass phrase
-				using MD5.
-		byte noecho:  
-			0=ask once, echo. 
-			1=ask once, no echo. 
-			2=ask twice, no echo.
-	Return 0 if no characters are input, else return 1.
-	If we return 0, the hashed key will not be useful.
-*/
-int GetHashedPassPhrase(char *hash, boolean noecho)
-{	char keystr1[MAXKEYLEN+2], keystr2[MAXKEYLEN+2];
-	int len;
-
-	if (showpass)
-		noecho = 0;
-	for (;;) {
-		fprintf(pgpout,LANG("\nEnter pass phrase: "));
-		getstring(keystr1,MAXKEYLEN-1,!noecho);
-		if (noecho<2)	/* no need to ask again if user can see it */
-			break;
-		fprintf(pgpout,LANG("\nEnter same pass phrase again: "));
-		getstring(keystr2,MAXKEYLEN-1,!noecho);
-		if (strcmp(keystr1,keystr2)==0)
-			break;
-		fprintf(pgpout,LANG("\n\007Error: Pass phrases were different.  Try again."));
-		memset(keystr2, 0, sizeof(keystr2));
-	}
-	if (noecho && (filter_mode || quietmode))
-		putc('\n', pgpout);
-
-	len = strlen(keystr1);
-	if (len == 0)
-		return 0;
-	/* We assume ASCII pass phrases, with no charset conversions. */
-	/* This will have to change for EBCDIC */
-	hashpass (keystr1, strlen(keystr1), (byte *) hash);
-	memset(keystr1, 0, sizeof(keystr1));
-	return 1;
-} /* GetHashedPassPhrase */
-
+/*	passwd.c - Password reading/hashing routines
+	Implemented in Microsoft C.
+	Routines for getting a pass phrase from the user's console.
+
+	(c) Copyright 1990-1996 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.
+*/
+
+#include	<stdio.h>	/* for fprintf() */
+#include	<ctype.h>	/* for isdigit(), toupper(), etc. */
+#include	<string.h>	/* for strlen() */
+
+#include	"random.h"	/* for getstring() */
+#include	"md5.h"
+#include	"language.h"
+#include	"pgp.h"
+#include        "charset.h"
+
+#ifdef AMIGA
+#       include "system.h"
+#endif
+
+#define MAXKEYLEN 254	/* max byte length of pass phrase */
+
+boolean showpass = FALSE;
+
+/*
+**	hashpass - Hash pass phrase down to 128 bits (16 bytes).
+**  keylen must be less than 1024.
+**	Use the MD5 algorithm.
+*/
+void hashpass (char *keystring, int keylen, byte *hash)
+{
+	struct MD5Context mdContext;
+
+	/* Calculate the hash */
+	MD5Init(&mdContext);
+	MD5Update(&mdContext, (unsigned char *) keystring, keylen);
+	MD5Final(hash, &mdContext);
+} /* hashpass */
+
+
+/*
+**	GetHashedPassPhrase - get pass phrase from user,
+		 hashes it to an IDEA key.
+	Parameters:
+		returns char *keystring as the pass phrase itself
+		return char *hash as the 16-byte hash of the pass phrase
+				using MD5.
+		byte noecho:  
+			0=ask once, echo. 
+			1=ask once, no echo. 
+			2=ask twice, no echo.
+	Return 0 if no characters are input, else return 1.
+	If we return 0, the hashed key will not be useful.
+*/
+int GetHashedPassPhrase(char *hash, boolean noecho)
+{	char keystr1[MAXKEYLEN+2], keystr2[MAXKEYLEN+2];
+	int len;
+
+	if (showpass)
+		noecho = 0;
+	for (;;) {
+		fprintf(pgpout,LANG("\nEnter pass phrase: "));
+#ifdef AMIGA
+                requesterdesc=LANG("\nEnter pass phrase: ");
+#endif
+		getstring(keystr1,MAXKEYLEN-1,!noecho);
+		if (noecho<2)	/* no need to ask again if user can see it */
+			break;
+		fprintf(pgpout,LANG("\nEnter same pass phrase again: "));
+#ifdef AMIGA
+                requesterdesc=LANG("\nEnter same pass phrase again: ");
+#endif
+		getstring(keystr2,MAXKEYLEN-1,!noecho);
+		if (strcmp(keystr1,keystr2)==0)
+			break;
+		fprintf(pgpout,
+LANG("\n\007Error: Pass phrases were different.  Try again."));
+		memset(keystr2, 0, sizeof(keystr2));
+	}
+	if (noecho && (filter_mode || quietmode))
+		putc('\n', pgpout);
+
+	len = strlen(keystr1);
+	if (len == 0)
+		return 0;
+	CONVERT_TO_CANONICAL_CHARSET(keystr1);
+	hashpass (keystr1, strlen(keystr1), (byte *) hash);
+	memset(keystr1, 0, sizeof(keystr1));
+	memset(keystr2, 0, sizeof(keystr2));
+	return 1;
+} /* GetHashedPassPhrase */
+