Restore Old Behavior of Empty Passwords in .p12s

This fixes a regression in ac9086a
ProcursusTeam · Jan 18, 2023 · f64e8a6 · f64e8a6
1 parent ac9086a
commit f64e8a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/_ldid b/_ldid
@@ -2,7 +2,7 @@
 
 _arguments \
 	'-S-[Add signature]:entitlements:_files' \
- 	'-w[Shallow sign]' \   
+	'-w[Shallow sign]' \
 	'-Q-[Embed requirements]:requirements:_files' \
 	'(-S)-r[Remove signature]' \
 	'(-r)-h[Print signature information]' \

diff --git a/ldid.cpp b/ldid.cpp
@@ -116,7 +116,7 @@
 
 bool flag_w(false);
 bool flag_U(false);
-std::string password;
+std::string password = "";
 std::vector<std::string> cleanup;
 bool flag_H(false);
 
@@ -1826,7 +1826,7 @@ class Stuff {
             exit(1);
         }
 
-        if (!flag_U) {
+        if (PKCS12_verify_mac(value_, "", 0) == 0 && !flag_U) {
             char passbuf[2048];
             UI_UTIL_read_pw_string(passbuf, 2048, "Enter password: ", 0);
             password = passbuf;