equal
deleted
inserted
replaced
1 --- p7zip_9.20.1/CPP/7zip/UI/Console/UserInputUtils.cpp.orig 2012-02-15 10:43:48.907800737 -0800 |
1 --- p7zip_15.14.1/CPP/7zip/UI/Console/UserInputUtils.cpp Fri Jun 19 09:25:18 2015 |
2 +++ p7zip_9.20.1/CPP/7zip/UI/Console/UserInputUtils.cpp 2012-02-15 10:44:21.754378258 -0800 |
2 +++ p7zip_15.14.1/CPP/7zip/UI/Console/UserInputUtils.cpp Tue Apr 19 13:43:59 2016 |
3 @@ -78,12 +78,12 @@ |
3 @@ -89,12 +89,12 @@ |
|
4 outStream->Flush(); |
|
5 } |
4 #ifdef ENV_HAVE_GETPASS |
6 #ifdef ENV_HAVE_GETPASS |
5 (*outStream) << "\nEnter password (will not be echoed) :"; |
|
6 outStream->Flush(); |
|
7 - AString oemPassword = getpass(""); |
7 - AString oemPassword = getpass(""); |
8 + AString oemPassword = getpassphrase(""); |
8 + AString oemPassword = getpassphrase(""); |
9 if (verify) |
9 if ( (verify) && (outStream) ) |
10 { |
10 { |
11 (*outStream) << "Verify password (will not be echoed) :"; |
11 (*outStream) << "Verify password (will not be echoed) :"; |
12 outStream->Flush(); |
12 outStream->Flush(); |
13 - AString oemPassword2 = getpass(""); |
13 - AString oemPassword2 = getpass(""); |
14 + AString oemPassword2 = getpassphrase(""); |
14 + AString oemPassword2 = getpassphrase(""); |
15 if (oemPassword != oemPassword2) throw "password verification failed"; |
15 if (oemPassword != oemPassword2) throw "password verification failed"; |
16 } |
16 } |
17 #else |
17 return MultiByteToUnicodeString(oemPassword, CP_OEMCP); |