openpgp: Rename the hash prefix to digest prefix.

1 files changed, 13 insertions, 13 deletions

diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs
index 4319df42..4ad58c9c 100644
--- a/openpgp/src/parse/parse.rs
+++ b/openpgp/src/parse/parse.rs
@@ -1008,8 +1008,8 @@ impl Signature4 {
         let unhashed_area
             = php_try!(php.parse_bytes("unhashed_area",
                                    unhashed_area_len as usize));
-        let hash_prefix1 = php_try!(php.parse_u8("hash_prefix1"));
-        let hash_prefix2 = php_try!(php.parse_u8("hash_prefix2"));
+        let digest_prefix1 = php_try!(php.parse_u8("digest_prefix1"));
+        let digest_prefix2 = php_try!(php.parse_u8("digest_prefix2"));
         if ! pk_algo.for_signing() {
             return php.fail("not a signature algorithm");
         }
@@ -1021,7 +1021,7 @@ impl Signature4 {
             typ.into(), pk_algo.into(), hash_algo,
             SubpacketArea::new(hashed_area),
             SubpacketArea::new(unhashed_area),
-            [hash_prefix1, hash_prefix2],
+            [digest_prefix1, digest_prefix2],
             mpis).into()))?;
 
         // Locate the corresponding HashedReader and extract the
@@ -1150,7 +1150,7 @@ fn signature_parser_test () {
             assert_eq!(p.hash_algo(), HashAlgorithm::SHA512);
             assert_eq!(p.hashed_area().data.len(), 29);
             assert_eq!(p.unhashed_area().data.len(), 10);
-            assert_eq!(p.hash_prefix(), &[0x65u8, 0x74]);
+            assert_eq!(p.digest_prefix(), &[0x65u8, 0x74]);
             assert_eq!(p.mpis().serialized_len(), 258);
         } else {
             panic!("Wrong packet!");
@@ -1351,21 +1351,21 @@ impl<'a> Parse<'a, OnePassSig3> for OnePassSig3 {
 fn one_pass_sig_test () {
     struct Test<'a> {
         filename: &'a str,
-        hash_prefix: Vec<[u8; 2]>,
+        digest_prefix: Vec<[u8; 2]>,
     };
 
     let tests = [
             Test {
                 filename: "signed-1.gpg",
-                hash_prefix: vec![ [ 0x83, 0xF5 ] ],
+                digest_prefix: vec![ [ 0x83, 0xF5 ] ],
             },
             Test {
                 filename: "signed-2-partial-body.gpg",
-                hash_prefix: vec![ [ 0x2F, 0xBE ] ],
+                digest_prefix: vec![ [ 0x2F, 0xBE ] ],
             },
             Test {
                 filename: "signed-3-partial-body-multiple-sigs.gpg",
-                hash_prefix: vec![ [ 0x29, 0x64 ], [ 0xff, 0x7d ] ],
+                digest_prefix: vec![ [ 0x29, 0x64 ], [ 0xff, 0x7d ] ],
             },
     ];
 
@@ -1385,19 +1385,19 @@ fn one_pass_sig_test () {
             } else if let Packet::Signature(ref sig) = pp.packet {
                 eprintln!("  {}:\n  prefix: expected: {}, in sig: {}",
                           test.filename,
-                          crate::fmt::to_hex(&test.hash_prefix[sigs][..], false),
-                          crate::fmt::to_hex(sig.hash_prefix(), false));
+                          crate::fmt::to_hex(&test.digest_prefix[sigs][..], false),
+                          crate::fmt::to_hex(sig.digest_prefix(), false));
                 eprintln!("  computed hash: {}",
                           crate::fmt::to_hex(&sig.computed_digest().unwrap(),
                                              false));
 
-                assert_eq!(&test.hash_prefix[sigs], sig.hash_prefix());
-                assert_eq!(&test.hash_prefix[sigs][..],
+                assert_eq!(&test.digest_prefix[sigs], sig.digest_prefix());
+                assert_eq!(&test.digest_prefix[sigs][..],
                            &sig.computed_digest().unwrap()[..2]);
 
                 sigs += 1;
             } else if one_pass_sigs > 0 {
-                assert_eq!(one_pass_sigs, test.hash_prefix.len(),
+                assert_eq!(one_pass_sigs, test.digest_prefix.len(),
                            "Number of OnePassSig packets does not match \
                             number of expected OnePassSig packets.");
             }