bech32 0.8

Cargo.lock

@@ -194,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "bech32"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c"
+checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4"
 
 [[package]]
 name = "bitflags"

age-plugin/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 age-core = { version = "0.5.0", path = "../age-core", features = ["plugin"] }
-bech32 = "0.7.2"
+bech32 = "0.8"
 chrono = "0.4"
 secrecy = "0.7"
 

age-plugin/src/lib.rs

@@ -159,6 +159,7 @@
 #![deny(intra_doc_link_resolution_failure)]
 #![deny(missing_docs)]
 
+use bech32::Variant;
 use secrecy::SecretString;
 use std::io;
 
@@ -184,6 +185,7 @@ pub fn print_new_identity(plugin_name: &str, identity: &[u8], recipient: &[u8])
         bech32::encode(
             &format!("{}{}", PLUGIN_RECIPIENT_PREFIX, plugin_name),
             recipient.to_base32(),
+            Variant::Bech32
         )
         .expect("HRP is valid")
     );
@@ -192,6 +194,7 @@ pub fn print_new_identity(plugin_name: &str, identity: &[u8], recipient: &[u8])
         bech32::encode(
             &format!("{}{}-", PLUGIN_IDENTITY_PREFIX, plugin_name),
             identity.to_base32(),
+            Variant::Bech32,
         )
         .expect("HRP is valid")
         .to_uppercase()

age/Cargo.toml

@@ -40,7 +40,7 @@ scrypt = { version = "0.6", default-features = false }
 rand = "0.7"
 
 # - Key encoding
-bech32 = "0.7.2"
+bech32 = "0.8"
 
 # OpenSSH-specific dependencies:
 # - RSAES-OAEP from RFC 8017 with SHA-256 and MGF1

age/src/util.rs

@@ -1,4 +1,4 @@
-use bech32::FromBase32;
+use bech32::{FromBase32, Variant};
 
 #[cfg(all(any(feature = "armor", feature = "cli-common"), windows))]
 pub(crate) const LINE_ENDING: &str = "\r\n";
@@ -6,9 +6,13 @@ pub(crate) const LINE_ENDING: &str = "\r\n";
 pub(crate) const LINE_ENDING: &str = "\n";
 
 pub(crate) fn parse_bech32(s: &str) -> Option<(String, Vec<u8>)> {
-    bech32::decode(s)
+    bech32::decode(s).ok().and_then(|(hrp, data, variant)| {
-        .ok()
+        if let Variant::Bech32 = variant {
-        .and_then(|(hrp, data)| Vec::from_base32(&data).ok().map(|d| (hrp, d)))
+            Vec::from_base32(&data).ok().map(|d| (hrp, d))
+        } else {
+            None
+        }
+    })
 }
 
 pub(crate) mod read {

age/src/x25519.rs

@@ -4,7 +4,7 @@ use age_core::{
     format::{FileKey, Stanza, FILE_KEY_BYTES},
     primitives::{aead_decrypt, aead_encrypt, hkdf},
 };
-use bech32::ToBase32;
+use bech32::{ToBase32, Variant};
 use rand::rngs::OsRng;
 use secrecy::ExposeSecret;
 use secrecy::SecretString;
@@ -64,7 +64,8 @@ impl Identity {
     pub fn to_string(&self) -> SecretString {
         let mut sk_bytes = self.0.to_bytes();
         let sk_base32 = sk_bytes.to_base32();
-        let mut encoded = bech32::encode(SECRET_KEY_PREFIX, sk_base32).expect("HRP is valid");
+        let mut encoded =
+            bech32::encode(SECRET_KEY_PREFIX, sk_base32, Variant::Bech32).expect("HRP is valid");
         let ret = SecretString::new(encoded.to_uppercase());
 
         // Clear intermediates
@@ -151,7 +152,12 @@ impl fmt::Display for Recipient {
         write!(
             f,
             "{}",
-            bech32::encode(PUBLIC_KEY_PREFIX, self.0.as_bytes().to_base32()).expect("HRP is valid")
+            bech32::encode(
+                PUBLIC_KEY_PREFIX,
+                self.0.as_bytes().to_base32(),
+                Variant::Bech32
+            )
+            .expect("HRP is valid")
         )
     }
 }