From 66f86974351204a0294ca708740f12e8cb63eb1f Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Mon, 27 Sep 2021 14:33:06 -0700 Subject: [PATCH] Remove DSA signing stuff, since nothing should be using it by now --- Cog.xcodeproj/project.pbxproj | 4 ---- Info.plist | 2 -- Scripts/update_feed.rb | 4 +--- dsa_pub.pem | 12 ------------ 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 dsa_pub.pem diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 9280cde27..9fc820287 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -97,7 +97,6 @@ 56C63D910D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 56C63D900D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m */; }; 56DB084C0D6717DC00453B6A /* NSNumber+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB084B0D6717DC00453B6A /* NSNumber+CogSort.m */; }; 56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB08540D67185300453B6A /* NSArray+CogSort.m */; }; - 8319A68D1F79E99300C168D6 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 8319A67E1F79E99300C168D6 /* dsa_pub.pem */; }; 832C1253180BD1E2005507C1 /* Cog.help in Resources */ = {isa = PBXBuildFile; fileRef = 832C1252180BD1E2005507C1 /* Cog.help */; }; 834D793F20E4EFEA00C4A5CC /* OpusPlugin.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 834D794020E4EFEF00C4A5CC /* VorbisPlugin.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8301F94520E4EEF70017B2DC /* VorbisPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -827,7 +826,6 @@ 56DB08530D67185300453B6A /* NSArray+CogSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSArray+CogSort.h"; path = "Spotlight/NSArray+CogSort.h"; sourceTree = ""; }; 56DB08540D67185300453B6A /* NSArray+CogSort.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSArray+CogSort.m"; path = "Spotlight/NSArray+CogSort.m"; sourceTree = ""; }; 8314D63B1A354DFE00EEE8E6 /* sidplay.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sidplay.xcodeproj; path = Plugins/sidplay/sidplay.xcodeproj; sourceTree = ""; }; - 8319A67E1F79E99300C168D6 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; 832C1252180BD1E2005507C1 /* Cog.help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Cog.help; sourceTree = ""; }; 833F681E1CDBCAA700AFB9F0 /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; 833F681F1CDBCAA800AFB9F0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; @@ -1355,7 +1353,6 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 8319A67E1F79E99300C168D6 /* dsa_pub.pem */, 832C1252180BD1E2005507C1 /* Cog.help */, 8E07AD280AAC9BE600A4B32F /* Preference Panes */, 8E75758E09F31D800080F1EE /* Icons */, @@ -2122,7 +2119,6 @@ 17E41E070C130DFF00AC744D /* Credits.html in Resources */, 8384916618083EAB00E7332D /* repeatModeOneTemplate.pdf in Resources */, 8E7575DB09F31E930080F1EE /* Localizable.strings in Resources */, - 8319A68D1F79E99300C168D6 /* dsa_pub.pem in Resources */, 83849174180843B200E7332D /* stopDockBadgeColorful.png in Resources */, 83E5E54C18087CA5001F3284 /* miniModeOffTemplate.pdf in Resources */, 83849173180843B200E7332D /* playDockBadgeColorful.png in Resources */, diff --git a/Info.plist b/Info.plist index b3c737e60..022e45197 100644 --- a/Info.plist +++ b/Info.plist @@ -1045,8 +1045,6 @@ Cog has no use for your reminders. Why are you trying to access them with an audio player? SUFeedURL https://f.losno.co/cog/mercury.xml - SUPublicDSAKeyFile - dsa_pub.pem SUPublicEDKey omxG7Rp0XK9/YEvKbVy7cd44eVAh1LJB6CmjQwjOJz4= diff --git a/Scripts/update_feed.rb b/Scripts/update_feed.rb index 3469e4ca6..c815ab70d 100755 --- a/Scripts/update_feed.rb +++ b/Scripts/update_feed.rb @@ -8,8 +8,6 @@ require 'time' feed = ARGV[0] || 'mercury' -signature_file = "#{Dir.home}/.ssh/dsa_priv.pem" - site_dir = "#{Dir.home}/Source/Repos/kode54-net/cog" appcast = open("#{site_dir}/#{feed}_builds/#{feed}.xml") @@ -99,7 +97,7 @@ if 1 #appcast_revision < latest_revision %x[rm '#{descriptiondoc.path}'] #Update appcast - %x[generate_appcast '#{signature_file}' '#{site_dir}/#{feed}_builds'] + %x[generate_appcast '#{site_dir}/#{feed}_builds'] #List out the deltas deltas = Dir.entries("#{site_dir}/#{feed}_builds").select { |f| f =~ /\A#{Regexp.escape(deltamask)}.+\.delta\z/ }.map { |f| File.join("#{site_dir}/#{feed}_builds", f) } diff --git a/dsa_pub.pem b/dsa_pub.pem deleted file mode 100644 index 4abfc4266..000000000 --- a/dsa_pub.pem +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBtjCCASsGByqGSM44BAEwggEeAoGBANMj3L7BtNvmyJjitgXGsJVjfb3trGXm -pYS0RHGtluUXC2yeYizTtDnAVwuVqY0e39doi13XVP28kGZ/EAwxlCH0JjnikUA2 -0GModTu7UJfVLxlS4OmnuokWby1KPrPJ2v7V62zyhP65xQAyDbJSTUmBwrTitb5p -fAvmoYEi+xi7AhUA0S6Cb8EyCLS0+2O5zuotiP6IGxUCgYASgjo0nrZ8HkC7hX0T -PhO1+GCGZpHInH+zB79s/thhaGODzKpvNDWBbkDeGaUQ4gR/+Tdcd2YftWWTXOmH -q4jZE2OKy7oQx4FeRFlpStMF5EQ8qQkxpposa33Mugn3lJZSbs2aX37pmgDIJvRj -xx900IvEjmfn5nRHhqldZ1bWagOBhAACgYBpl0t54NhfalMJcFr55ty/xkDaW41m -2dKuzxY2BoxZv0kQJfrpJYeIFxxWQZoeNjBhnL/xzuj4BauvM67QlL67u3hY6/vJ -VJVupSscLi8uf0AXwilBo7ZwI9xRRsux/e6zLzGxigmRNwLdx4X7jsTATIMpBki8 -4L7I18u7VZ8feg== ------END PUBLIC KEY-----