Index: externals/Harpy/Tools/sign.eagle ================================================================== --- externals/Harpy/Tools/sign.eagle +++ externals/Harpy/Tools/sign.eagle @@ -26,10 +26,20 @@ # # NOTE: Indicate to the caller, if any, that we have failed. # exit 1 } + +proc maybeForceHashAlgorithm { certificate keyPairType } { + # + # HACK: Some key pair types, e.g. DSA v1, require hard-coded + # hash algorithms, e.g. SHA1. Do that now, if needed. + # + if {$keyPairType eq "DSA"} then { + $certificate HashAlgorithm SHA1 + } +} proc isScriptFile { fileName } { switch -exact -- [file extension $fileName] { .tcl - .tk - @@ -365,17 +375,19 @@ # # NOTE: Grab the public key we need to verify that our signing # process worked correctly. # - set publicKey [keypair open -alias -public $publicKeyFile] + set publicKey [keypair open \ + -alias -public $publicKeyFile] # # NOTE: Grab the private key we need to actually create the # detached certificate for the data file. # - set privateKey [keypair open -alias -public -private $privateKeyFile] + set privateKey [keypair open \ + -alias -public -private $privateKeyFile] # # NOTE: Has embedded certificate handling been requested? # If so, make sure we can actually do it. # @@ -416,10 +428,11 @@ # # NOTE: Import the license certificate. # set certificate [certificate import $fileName] + maybeForceHashAlgorithm $certificate [$privateKey KeyPairType] # # HOOK: Post-certificate object creation (import). # catch {certificate_hook phase1} @@ -469,10 +482,12 @@ set certificate [certificate import -alias $certificateFile] } else { set certificate [object create -alias \ Licensing.Components.Public.Certificate] } + + maybeForceHashAlgorithm $certificate [$privateKey KeyPairType] # # HOOK: Post-certificate object creation (create). # catch {certificate_hook phase1} Index: externals/Harpy/Tools/sign.eagle.asc ================================================================== --- externals/Harpy/Tools/sign.eagle.asc +++ externals/Harpy/Tools/sign.eagle.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJfq3ikAAoJEFAslq9JXcLZehoQAMNid73RvDNwSXkwS7xlOyzs -guTzPhoqOdbaVcQmMrDnpxnVOPF1yL4tAghjPhuGG+IRN3sCFfic+BzuP2qQT7Du -ejMLjSjoz60/potmVwBru8Iv5QyoyD/BrL2aF3mJnRBUTffv0dcu7xSwQuOLBw6z -2XMnKOKovvx7z9Z8H1MV/Fr3iQIsJaN8JM1MTL7D75MQ7BTFLz2EM6K4dE7iidO8 -PzHuyayNbWo3IDRqaVSSp/TFECUbqSqPMe7yhpvnh11i2te4mcMbswuqKWDPLD0S -Kb2wIptV+apOLWNVeNdrbyA2qC0hM40CGzTvzgxjSXFEM8VgMrcBJCyELTn0n3yw -XGkz5nAdlWdvl0qB2Cih/wNKmMYosFxB1Xqd0IC+EmPBhfGwvWTv8gflfEI9vk1K -nEHnfNB6pRZZfE7cqi1ydOMooVNCyeY5o784VwcCujz+/lIyFxaub/H2FtO7H5XU -aYiPPdo2YD4sOfSVyq74J/j8YEtnZgHmz5XKn9dhKr7Vj+x52wuskli91Yy6X9Ig -fx/ekYT/CUS06+y9fTZ1rTwfx//Emsx/znZopzz1pnRud7M26U3+kQzUeCtaQIZ4 -vkR/qQhaXfY93J0TEGUbAzlmZZmq/ilkGm1N4rKs5lRulJQEnzfyxQRJyEqUEDxQ -OCAjCnrB+4jZbdz35y5Z -=VGbj +iQIcBAABCAAGBQJgAch/AAoJEFAslq9JXcLZKakP/1Zw6w9e8KoyQO9vEgimvt49 +sbhN3Oi0IxMq4oKGGntVt4JSW6Oxu+sFw0/q15jT4nQyH4P6mlSQE0wZGAzN+Or5 +a9PlQMD+eFgG6hd7hJjNfSWOqUAJq0ICjCAnDMuV72naurVWmEwBwCC3xyE2mVSy +MkpnB62vndNYGANpCEPjwlHUMiGJD8UQ0xYRQ/tSrtCLnfQ5vOBhU684b5dxAQpY +OiGjE2nPhmyt+QsH+pmvuyf12TX7IGDQL3b+V/Hq3qzsSDGJrwsJOX84yWzyaNfN +ixCYHatKRMCDgHpS0c5lei4f7lAvkf/myPLbChGIGP40TIQOwGOL0A9Ee5L4VKpz +jxnNtaAhMERXYLbUevwuyPml8VbGekx4s6HAfeGQ/gbkSOPM9QEUmdjesabkeKv2 +HcHwdE7Dx2Z8XcDWbeF5FKF9NvLXngB7QH8itbVExHRxafTjXDpLmGL7q+PMzltt +B530/6+CAmlKfR0TajU+OTG91G3Nxsdbv1MVe1zJ9BbJlbAVW73mO4JlHHdH5Jus +uQPPTkxqDLVF6xAPJKiVkz5JAoCkF2++MSHJl/TEWN1K/thkIWPLIX5s+Vr5V0gf +ZuvEHOO7chhA4ffvKOsYvntBazLyIVApguyLnK9Ga+c75MeLCbZcVTLNlCNnBnIP +G6r+WXY3cxiAfwG4upvv +=GLVl -----END PGP SIGNATURE----- Index: externals/Harpy/Tools/sign.eagle.harpy ================================================================== --- externals/Harpy/Tools/sign.eagle.harpy +++ externals/Harpy/Tools/sign.eagle.harpy @@ -19,50 +19,50 @@ None Mistachkin Systems - cfe88817-22c8-4629-a084-9e7cbbff6108 + 29526660-fbba-43ab-aa51-aaf0f8655191 SHA512 Script - 2020-11-20T03:07:10.8573165Z + 2021-01-15T16:53:07.8910186Z -1.00:00:00 0x9559f6017247e3e2 - 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 Index: externals/Harpy/Tools/sign.eagle.harpy.asc ================================================================== --- externals/Harpy/Tools/sign.eagle.harpy.asc +++ externals/Harpy/Tools/sign.eagle.harpy.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJfq3imAAoJEFAslq9JXcLZaDYP/idzjwF5o7eRkQG8yq59UTvJ -sIH4a2PGXipPV6b/KFia5askSfe4UR3Azt49T363ZIj0mdzcxpIbRhBpkAysbX7k -7DE3mhic5zDhycX3TalCOyw+V53L9XEvAfP9XIU0Bb1h3YlFx3pgzQfTqcEyp/ya -S/4BSDnKT7GGSY3RLghwmgCnuweOUCyWXkScEFRnAIhv/OxozF8vn5RGHeo7rch3 -Tq65zFVnN85YoaA75L9f8j3bXxpcka2L7zZkY6fIuPUl8O/vxlQ678BR5hZHYKrv -9PmmR/+Z0tm051fdTX+JE4jv+dWKaT2DNkxOLjT9FBDBnu/nsKDAOZIcB4gTUvmT -vuv2HvnHb37vmlKdez6lcYEZfZle0/K1lqKpA7+idZXty+C5lCFPnEZQ5wA1ZAaE -t5LtUu7lOjW4XItmQcu2JVCVeHnjDTGd1zEuVZ7EgeApOTEM7qhcbh2tqi0x4tPy -Ydyv/Seh+FdsFZUdrBEDxAp634qdnVCQ4NCNmJjt+nfO4PWR/Jt/c+mjSQ04xxAK -AdYekH3fAv5q0myBPst0NC6j3rR4UzztWo4Ak9bZ9fglZ9R9zHNuf8o6tDF45BTc -ll3xVj0oGSd6EZqturRrXBUL7OSbouiWG3Szr0DN8Bgw/kxut1CeOIo5VnRyGyNU -1aX+Fvc5HMIrj6byxCTl -=+JDp +iQIcBAABCAAGBQJgAciAAAoJEFAslq9JXcLZ5e8P/3lRUnzl7AQLKAk8hH66z463 +kvaAplHlddGVli6zdO9qNTAHwGcTMH/9/aC7rLv70u5je9JwFLqa6OjZt/DXZcNt +xst6N9WY1lmbBV2W6aZ+CayQBs+EufNoDlKBeoRiaXW4aROJv/0mEUXIebqcYKPf +ccwAlTgH+fIwnPRnnaBRQyKrc0aZnD2LYV7PKttKuwxVOJG+kfi0Su0bM8Nc8Xun +7PjJIGCTpU9u6Jny/L9hWRZerBDm7IgAWFBP77edWbTObNYuneMI+bo8/Pdf4Zwm ++1Y9LZ+bCQqMp/r8vNjT87HhWcHqGiQE8JjsZoT8P0SB6oyHfUAe8M6kQS8kGiRh +6XeCqTVqf7KyCqkDUk8IY2x7NIKk5TKxGzz1e2caa/QLKuguoaemykX0lJnrBAKy +jf2+08Ag2WlcWD0c/YniPMWk2f5XxVyk9KC+OirmhycYgSFLQ4DOQ4YrG6cuEJFk +bol9LfwqMKKBe3wWu9KYj6hkpe8FuO1aGkS8SBKEoIqaxb6IcOwW++ZMZF2HWsV/ +iyby29lZiZyyKoZdy/KtJg9E8D9Q4+cIm91kljFxCc85JMtztv+OHk5PUJ4C0+Iy +Nmbo13UBFcVCNsdEsCSBszDdBbFArZ8WqTNoYxvv7RqMpbvUxChsh5Dq1skfRkol +gO3uq1OQ1C05HsotNZt4 +=YETw -----END PGP SIGNATURE-----