Index: externals/Harpy/Tools/sign.eagle ================================================================== --- externals/Harpy/Tools/sign.eagle +++ externals/Harpy/Tools/sign.eagle @@ -27,16 +27,18 @@ # NOTE: Indicate to the caller, if any, that we have failed. # exit 1 } -proc maybeForceHashAlgorithm { certificate keyPairType } { +proc maybeForceHashAlgorithm { certificate keyPair } { # # 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 { + if {[isNonNullObjectHandle $keyPair] && \ + [lsearch -exact -- [keypair metadata] KeyPairType] != -1 && \ + [$keyPair KeyPairType] eq "DSA"} then { $certificate HashAlgorithm SHA1 } } proc isScriptFile { fileName } { @@ -428,11 +430,11 @@ # # NOTE: Import the license certificate. # set certificate [certificate import $fileName] - maybeForceHashAlgorithm $certificate [$privateKey KeyPairType] + maybeForceHashAlgorithm $certificate $privateKey # # HOOK: Post-certificate object creation (import). # catch {certificate_hook phase1} @@ -483,11 +485,11 @@ } else { set certificate [object create -alias \ Licensing.Components.Public.Certificate] } - maybeForceHashAlgorithm $certificate [$privateKey KeyPairType] + maybeForceHashAlgorithm $certificate $privateKey # # 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 -iQIcBAABCAAGBQJgEmVAAAoJEFAslq9JXcLZRzwP/1BhFhMFyHvKANGed6p9dRJj -QlpekS74s5XlX2EkW9OGDJgLgjEKcd7KTJw64HxaBc6qgkEB5+L2jzlEi+fQ2vbt -lfxvKkSx98tNH0wELYhfcRA3oYSGPiFh1cgOg+s1ZEcmD0IzmYUrvH8QfBr9gQNA -DHCE8bii94koKsPJosTawRzrcFjCHCyojFBGCrdRReX0H4ZV797u50an6isTdvbq -AAPtImbOd1tOpXO/3LZx5FRe18ORghwA9fGu7jJW6ld24leQA2vh7vJoT+EUNg/9 -otKGDt9GztAF5saLd0T/C2i+LcVMS6c7F59A/IW9U1tOeVUMSs9s+40xNi01UwIZ -OLO68HYZN5TYkfPZ4CCEpSFEYPYt37aDWzXUyC7OXMX7mbJIqw2MNk/Te3f5V1FB -VWNpca8ifpym8XZ9qqCK7Z2OFaXEAA26KKyBdynDLEv3sWzYDcAdJZ4VxdPVDdX9 -OyVEwDnRW+eELJ99PbhW1rcsgzyQ3gvF31rY/EDLWRkitWUbE0F52qyxLnhXpGvb -tZS+3dqXwQ7V9tNaAD7bRzq0YxxqG6B1l2ZDoAAj3hRjvsfl3W/zg0fYo6JSFPNH -K9+S13g8iOR1iLgNr9DEG65o8TGeR9gcuJefWuJKVPCzSmidm+P6u3UurN8cQ5fR -U3IZ/UyV31VqKNe2zICM -=Hp3D +iQIcBAABCAAGBQJgJ2+mAAoJEFAslq9JXcLZRWsP/0T+QErpT2mkbqjGMJ2o1S7N +m88BpP0qYDCug/B07Kz1bcG00j+kvWLXYXIrrjHRJOJKBWiumkdWQHKKlYIhyFiR +NfbvI6TsPSX/unKElCWoc/jsMMYs8TeGxfMtYTQHUESMnVb1h+hUCLz3k2zSgiNp +O8dGKsdB8qEF+npTi72MEUqXssQ+SVQBHaFxAiiwF2ONZgeJBEpUxwem4jlHEnpC +nKQwk6AsjPZgGBD7rBK/EtQhzPCOVGxsGU7CmX2Kb1fOFOsf8cjCmug4dZUrAv8Y +v5IzcghZh4y6ecnodExq8mPV7WcAzG7gHjwaoqD8yFNLnyEoZmb+BmTWCJuR5wGG +hBvNwmo6TS20G5E21UBQexY3Q6X+DIUoKl4eB5IEYi8BJjnXydtEY2JQQzfrrn07 +ABN/NshJMeLYPAECKWnaSzeDxLkCaFIxmyQrBZCLrbX6I5KvMOjdYjAu9it0rkOt +eFQqF+o9D+Ayv++uiQwhIZi68pK2X86Wbjqq9/dftzpuebxpK2DynN9bZD+NLtet +VC9uT0AF52c6xjTZu3ByMOgfcWPENiPQy40hIFSo8AH7rJSIDgvsBaZ1jx3rHm8K +fO1HVN+mf+KPDCo8tQpjoj1VFQnGBsvvGxuBkr8fveQamsTcdjskiGvk8MGB0XeK +dNnsutGaOksJmZiTjFu4 +=FDiV -----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 - eb2ee167-6000-44b0-bba5-49f8b66227c1 + 7032b76b-2e4e-4ae1-a219-14621781bcf4 SHA512 Script - 2021-01-28T07:16:52.2186366Z + 2021-02-11T03:02:25.7394092Z -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 -iQIcBAABCAAGBQJgEmVCAAoJEFAslq9JXcLZ+7cQAKtpw7aRTO7lR3I91J9zVl7c -HIF9D13dW8exUudBqt7Qd+AaWDHFurx/KhWt8sWVDNCg96oza74VOQA9ERS08Ycj -Rhu1EfGyVwf02o69eAeAm0qyUAUg31WuBRGgTiEsIj4pmPTikPshUo0UYENmG+T7 -ENLsLSM3jFf5iW+tlugRu8mmerHADBXJpjlzevEKmZh2J5Z0yUyWvAHDiAmgYaXk -M/JfH1tdaH7crHqFj+X/L15ijGfsQpshRD0XdWJY2QYcm2tgzEi7+06DU9o33AIw -VpQm5MHth0uQBfDNWfsVZK7D6bp3zdVwrdasRcFTzDjkf5mUeoObpiYccINTJIiV -LbAPchfF+6NSwfqb6yLi5WsTxJhLfVlonHayvlmctoaxYgGGMvR8gP2tszolVLW3 -8XzIFFs/E7V3TXQNSa5Iaw3sFv6sfdfVTdNGnZqIK8NtQsNJGQ0XF0UKh6LqdW3w -jSjCu9jXtApUiyeJNhJEYWbmq5MPMrsohikwMm+47X9velvr3FEqN5yoVZNtVeOs -xEIZmaxhS1TGL0hRuAMrcaOjrUdoue7iskiAGqompyhyiYuaPbnDvb0Oh7pBXwwL -Q0qFHb2oYI8jrpt6j9dmKSxmDR7U+0YimiuqM8mlcp1327GJJoAdmvGrt9RInNur -9I9WMVsIAEXxaaR5GS6q -=weX0 +iQIcBAABCAAGBQJgJ2+oAAoJEFAslq9JXcLZi8UP/0m7VWFeBfz/EcpmoHz2EMm6 +00ugRb5FSTNk+x4FCo7w/+kgNcMPJzpALq863NhnFIEdIe792HXeIp8MKuF4/xMq +5MTiXBASD0yoQKh1PBZF7yoGBi9fnIqTx+yfX94R4t233hbDX2743qbDPoiSs7nu +aVjHKCBRdEldr8VVepBDKTwIeUmd7P2RFzP+LFtqLAuPJ83TKAVXCmkQs4eW4dP/ +00icxD6NHiEnoU120LGxgSDMq8udQVGJHpq/iJraBJ9zMDQv2bUpg394NuukMXFg +vpIN79Ysy7vqriwFYXwGJFrzo35j0Rr+gWNliATByVK8ZMeGuUo6N8sqv2WJEAOl +69RPzQQmxNgjbwkUkR6chCZY9Zx3BRvr7thiCFxDXgW1z/3sDiN78ZesXcTOmNM7 +KZKNshU/KpBYt94/69rRrtPo+duMWEGY3YL6LHi008knxo5SblZtR2RuBFcT8mKg +qmnC1r7QmgDBzKnCzkZNQwdtGXOQszM3vO/2fSC9Kvlv5Ay+ZD4gc6whrb0jHSUY +9qDnXpjc+ShZv4qaFEwsyyjx1REo9mPINySJ8RqDwXm6Zq55OBLjGxqYQJBhcPqw +nQOBNHBPm0RNw+2YIoqrEPNBySRtbeJX+ROxbvIdmU2+lW5rjiZ7RpW4TH9bzK8h +Q3iFZUDq5KnVWH5AGm6M +=usq6 -----END PGP SIGNATURE-----