| author | shreya.jain@oracle.com <shreya.jain@oracle.com> |
| Mon, 07 Nov 2016 11:25:12 -0800 | |
| changeset 7254 | b5b14b374b25 |
| parent 5923 | 125ce0e23ed8 |
| permissions | -rw-r--r-- |
|
5923
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
1 |
--- p7zip_15.14.1/CPP/7zip/UI/Console/UserInputUtils.cpp Fri Jun 19 09:25:18 2015 |
|
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
2 |
+++ p7zip_15.14.1/CPP/7zip/UI/Console/UserInputUtils.cpp Tue Apr 19 13:43:59 2016 |
|
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
3 |
@@ -89,12 +89,12 @@ |
|
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
4 |
outStream->Flush(); |
|
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
5 |
} |
|
692
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
#ifdef ENV_HAVE_GETPASS |
|
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
- AString oemPassword = getpass("");
|
|
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
+ AString oemPassword = getpassphrase("");
|
|
5923
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
9 |
if ( (verify) && (outStream) ) |
|
692
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
{
|
|
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
(*outStream) << "Verify password (will not be echoed) :"; |
|
5923
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
12 |
outStream->Flush(); |
|
692
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
- AString oemPassword2 = getpass("");
|
|
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+ AString oemPassword2 = getpassphrase("");
|
|
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
if (oemPassword != oemPassword2) throw "password verification failed"; |
|
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
} |
|
5923
125ce0e23ed8
22288416 p7zip 15.14.1
Danek Duvall <danek.duvall@oracle.com>
parents:
692
diff
changeset
|
17 |
return MultiByteToUnicodeString(oemPassword, CP_OEMCP); |