diff --git a/ClickToFlash.xcodeproj/project.pbxproj b/ClickToFlash.xcodeproj/project.pbxproj index 8ce0316a..c7355e70 100755 --- a/ClickToFlash.xcodeproj/project.pbxproj +++ b/ClickToFlash.xcodeproj/project.pbxproj @@ -47,6 +47,7 @@ 69A26D0C0F302C10006648BC /* NSBezierPath-RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = 69A26D0B0F302C10006648BC /* NSBezierPath-RoundedRectangle.m */; }; 79166CBD0FF69E1800B1F69B /* CTGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = 79166CBB0FF69E1800B1F69B /* CTGradient.m */; }; 79A21C4D0F30B735009424B8 /* CTFWhitelistWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 79A21C490F30B735009424B8 /* CTFWhitelistWindowController.m */; }; + 79B1F5C0105D9CEE0081D0B0 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 79B1F5BF105D9CEE0081D0B0 /* dsa_pub.pem */; }; 79C040700FF1CCE6002DA6A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 79A060EB0FF1CBF50035F03A /* Sparkle.framework */; }; 79E2EB930F86AAD3005CF170 /* SparkleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 79E2EB920F86AAD3005CF170 /* SparkleManager.m */; }; 844695F70F470D1F00DC783A /* CTFsIFRSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 844695910F46FC6600DC783A /* CTFsIFRSupport.m */; }; @@ -147,6 +148,7 @@ 79475E0C0F658D9A00FD82E3 /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Plugin/Sparkle/Sparkle.xcodeproj; sourceTree = ""; }; 79A21C490F30B735009424B8 /* CTFWhitelistWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTFWhitelistWindowController.m; path = Plugin/CTFWhitelistWindowController.m; sourceTree = ""; }; 79A21C4A0F30B735009424B8 /* CTFWhitelistWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTFWhitelistWindowController.h; path = Plugin/CTFWhitelistWindowController.h; sourceTree = ""; }; + 79B1F5BF105D9CEE0081D0B0 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Plugin/dsa_pub.pem; sourceTree = ""; }; 79E2EB910F86AAD3005CF170 /* SparkleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SparkleManager.h; path = Plugin/SparkleManager.h; sourceTree = ""; }; 79E2EB920F86AAD3005CF170 /* SparkleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SparkleManager.m; path = Plugin/SparkleManager.m; sourceTree = ""; }; 844695900F46FC6600DC783A /* CTFsIFRSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTFsIFRSupport.h; path = Plugin/CTFsIFRSupport.h; sourceTree = ""; }; @@ -225,6 +227,7 @@ 072189BA0F30D9C3008C8944 /* ContextualMenu.xib */, 072189BC0F30D9C3008C8944 /* WhitelistPanel.xib */, A494CC2B0F9F2446007D5EEB /* ctf.icns */, + 79B1F5BF105D9CEE0081D0B0 /* dsa_pub.pem */, D9566C2B0F37EA0800358646 /* deSIFR Resources */, ); indentWidth = 4; @@ -368,6 +371,7 @@ 6953E43C0F3EDEB50014ECF7 /* MenubarMenu.xib in Resources */, A494CC2C0F9F2446007D5EEB /* ctf.icns in Resources */, 00FBE92F0FCD68CE00BC0995 /* NSActionTemplate.png in Resources */, + 79B1F5C0105D9CEE0081D0B0 /* dsa_pub.pem in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -492,7 +496,7 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_SIGN_COMPARE = YES; - PRODUCT_VERSION = 1.5.1; + PRODUCT_VERSION = 1.5.2; WARNING_CFLAGS = "-Wall"; }; name = Debug; @@ -505,7 +509,7 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_SIGN_COMPARE = YES; - PRODUCT_VERSION = 1.5.1; + PRODUCT_VERSION = 1.5.2; WARNING_CFLAGS = "-Wall"; }; name = Release; diff --git a/Installer/build_installer_pkg.command b/Installer/build_installer_pkg.command index 18eb160c..5ce68484 100755 --- a/Installer/build_installer_pkg.command +++ b/Installer/build_installer_pkg.command @@ -52,6 +52,10 @@ cp -R "$BUILT_PLUGIN" "$MY_INSTALLER_ROOT" # Stuff it into a .zip. cd "$BUILT_PRODUCTS_DIR" zip -r "$VERSIONED_NAME.zip" "ClickToFlash.pkg" -cd $SCRIPT_WD + +if [ -f "$HOME/Documents/releases/ClickToFlash/dsa_priv.pem" ]; then + `openssl dgst -sha1 -binary < "$VERSIONED_NAME.zip" | openssl dgst -dss1 -sign "$HOME/Documents/releases/ClickToFlash/dsa_priv.pem" | openssl enc -base64 > $VERSIONED_NAME.dsaSignature` +fi +cd "$SCRIPT_WD" rm -rf "$MY_INSTALLER_ROOT" diff --git a/Plugin/Info-Plugin.plist b/Plugin/Info-Plugin.plist index 23e0a5a9..8c82771b 100644 --- a/Plugin/Info-Plugin.plist +++ b/Plugin/Info-Plugin.plist @@ -24,6 +24,8 @@ ${PRODUCT_VERSION} NSPrincipalClass CTFClickToFlashPlugin + SUPublicDSAKeyFile + dsa_pub.pem SUFeedURL http://rentzsch.github.com/clicktoflash/release_notes/appcast.xml diff --git a/Plugin/dsa_pub.pem b/Plugin/dsa_pub.pem new file mode 100644 index 00000000..c27bb9a5 --- /dev/null +++ b/Plugin/dsa_pub.pem @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQCMqjpsWIy6jB/a4+NBg4hA8m7Fz7de +Z8S2RNqurpTldAjpN/0WDjKZkpKglqox4IZnwdkFACacvkEIX86JbOTvfy4+6fW8 +jquM7h0ZrBoBDkh9uEHHaZg/qPIdwFdc8kA+s8pPPsirDiGEPp+pa0APlWqL3hjs +aCmy28J5EffmOQ5bf9O7H+n6CPl4faYWFqz8gmTlSp+whabPfN0BFLeikqK9h+dJ +Al9KJcSZVCX/sI9E2/hu9mL9clrQrWFPy9FcD0cHB8uFczK21FUKDLCPer4gXkOp +mG7Prda/j/DSz0/yd6CzRAsF3PiM0pQep0aYAJrLAZSY8+cwymVQKYIxAhUA8V+G +B0YwsVc0HAUt/2lSiZBIYgkCggEAN2bDOjTJBykYVnIVfuomrjXsVMe0T/1LD7F8 +cE/XzUUMhYUD0t9Nu5kupRy/0mWJ56Sgy3Jdl/Oh+AQ18BkuX2j9+W6JR8NDCAfD +N/mKq+2teomTRc04q9iQnPmKHE+cctSU8peYXOIFvywGZNFwfLlrgMboiHcAU442 +7eFITWSZ7/ZG2IXmuMRpTON+7CVGmgRJTgUNh295FFLSUPgor3ptmmSoO9yiKX1s ++yPbnAYrgRfyY8TfizvmBCuBctt6y+unajMDKVn7wtCveUyP10zO4UW3hr53Nue/ +TY4jRWhHT4UZDeQask6T2yW3X3dYI4JbpkADiBDExbiJhcwpmAOCAQUAAoIBADT7 +Hfvhdn5krZ4sNqdkrU+Uuj31Q7Kj2dPu8bqCCPBt/E/cozKPan1NIxNKEnjRAEYE +lKE+jPAcghMl7cOpe1ngM/IZBp4pb/ddRtH1VsHrnmL8q573+ZRb3oF/I7FyMXKj +D0YQO/Ml8ZNPaOehaq2EF0lyLpBKnSY4Ej5UoxivpKG582oiEVQ1+DgKLRHQENXp +u1B/ryFyWer+9QvcOITbBFrd56le6kQHFOyURuRJ0L834e3xH8bwI8G3U/PT4nI8 +qmXSSH1VixBQ2TeXR4CKlcl4d+uE1ZOPU2J6ovo3RBkTvHxgvWWDD2ji0MzuQCee +XxnQylaLLkDrk25fZBo= +-----END PUBLIC KEY-----