diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-16T15·38+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-16T15·38+0100 |
commit | c4d22997f364a7fc2e5a8150c0a4a55590a92df5 (patch) | |
tree | 8167aef94ba86e0650a423fe21180fff42ccb118 /scripts | |
parent | 5ac27053e9bc4722dde5bd3243488d8e9a0b4623 (diff) |
Add C++ functions for .narinfo processing / signing
This is currently only used by the Hydra queue runner rework, but like eff5021eaa6dc69f65ea1a8abe8f3ab11ef5eb0a it presumably will be useful for the C++ rewrite of nix-push and download-from-binary-cache. (@shlevy)
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/nix-push.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/nix-push.in b/scripts/nix-push.in index 2d9d83f59b92..54456ac9512e 100755 --- a/scripts/nix-push.in +++ b/scripts/nix-push.in @@ -258,13 +258,10 @@ for (my $n = 0; $n < scalar @storePaths2; $n++) { } if (defined $secretKeyFile) { - my $s = readFile $secretKeyFile; - chomp $s; - my ($keyName, $secretKey) = split ":", $s; - die "invalid secret key file ‘$secretKeyFile’\n" unless defined $keyName && defined $secretKey; + my $secretKey = readFile $secretKeyFile; my $fingerprint = fingerprintPath($storePath, $narHash, $narSize, $refs); - my $sig = encode_base64(signString(decode_base64($secretKey), $fingerprint), ""); - $info .= "Sig: $keyName:$sig\n"; + my $sig = signString($secretKey, $fingerprint); + $info .= "Sig: $sig\n"; } my $pathHash = substr(basename($storePath), 0, 32); |