}
/// Compute the checksum bytes of a descriptor, excludes any existing checksum in the descriptor string from the calculation
-pub fn calc_checksum_bytes(mut desc: &str) -> Result<[u8; 8], DescriptorError> {
+fn calc_checksum_bytes(mut desc: &str) -> Result<[u8; 8], DescriptorError> {
let mut c = 1;
let mut cls = 0;
let mut clscount = 0;
pub mod template;
pub use self::checksum::calc_checksum;
-use self::checksum::calc_checksum_bytes;
pub use self::error::Error as DescriptorError;
pub use self::policy::Policy;
use self::template::DescriptorTemplateOut;
) -> Result<(ExtendedDescriptor, KeyMap), DescriptorError> {
let descriptor = match self.split_once('#') {
Some((desc, original_checksum)) => {
- let checksum = calc_checksum_bytes(desc)?;
- if original_checksum.as_bytes() != checksum {
+ let checksum = calc_checksum(desc)?;
+ if original_checksum != checksum {
return Err(DescriptorError::InvalidDescriptorChecksum);
}
desc