projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad8c2c4
)
clarifying make_rsa_key_body() to make_rsa_pub_key_body()
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 7 Jan 2009 20:02:05 +0000
(15:02 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 7 Jan 2009 20:02:05 +0000
(15:02 -0500)
src/keytrans/pem2openpgp
patch
|
blob
|
history
diff --git
a/src/keytrans/pem2openpgp
b/src/keytrans/pem2openpgp
index 3fdc469ac95df1c07fcd694fc4a5d3a0877e743f..c5277cda72daa904dd7f227b462d493ea785c9a9 100755
(executable)
--- a/
src/keytrans/pem2openpgp
+++ b/
src/keytrans/pem2openpgp
@@
-78,7
+78,7
@@
sub mpi_pack {
}
# FIXME: genericize this to accept either RSA or DSA keys:
}
# FIXME: genericize this to accept either RSA or DSA keys:
-sub make_rsa_key_body {
+sub make_rsa_
pub_
key_body {
my $key = shift;
my $timestamp = shift;
my $key = shift;
my $timestamp = shift;
@@
-97,7
+97,7
@@
sub fingerprint {
my $key = shift;
my $timestamp = shift;
my $key = shift;
my $timestamp = shift;
- my $rsabody = make_rsa_key_body($key, $timestamp);
+ my $rsabody = make_rsa_
pub_
key_body($key, $timestamp);
return Digest::SHA1::sha1_hex(pack('Cn', 0x99, length($rsabody)).$rsabody);
}
return Digest::SHA1::sha1_hex(pack('Cn', 0x99, length($rsabody)).$rsabody);
}
@@
-176,7
+176,7
@@
my $sig_data_to_be_hashed =
$subpacket_octets.
$subpackets_to_be_hashed;
$subpacket_octets.
$subpackets_to_be_hashed;
-my $pubkey = make_rsa_key_body($rsa, $timestamp);
+my $pubkey = make_rsa_
pub_
key_body($rsa, $timestamp);
#open(KEYFILE, "</home/wt215/gpg-test/key-data");
my $key_data = make_packet(6, $pubkey);
#open(KEYFILE, "</home/wt215/gpg-test/key-data");
my $key_data = make_packet(6, $pubkey);