author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Thu, 31 Jul 2014 12:01:39 -0700 | |
branch | s11-update |
changeset 3243 | 1359280d9099 |
parent 692 | cc6e91029604 |
child 5923 | 125ce0e23ed8 |
permissions | -rw-r--r-- |
692
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
--- p7zip_9.20.1/CPP/7zip/UI/Console/UserInputUtils.cpp.orig 2012-02-15 10:43:48.907800737 -0800 |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
+++ p7zip_9.20.1/CPP/7zip/UI/Console/UserInputUtils.cpp 2012-02-15 10:44:21.754378258 -0800 |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
@@ -78,12 +78,12 @@ |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
#ifdef ENV_HAVE_GETPASS |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
(*outStream) << "\nEnter password (will not be echoed) :"; |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
outStream->Flush(); |
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(""); |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
if (verify) |
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) :"; |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
outStream->Flush(); |
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 |
} |
cc6e91029604
7114550 problems extracting password protected 7z archive
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
#else |