Merge pull request #253 from jonhoo/base64-bump

Bump base64 dependency

Author: jonhoo

.github/workflows/check.yml

@@ -89,7 +89,7 @@ jobs:
     # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
     strategy:
       matrix:
-        msrv: [1.56.1] # 2021 edition requires 1.56
+        msrv: [1.57.0] # base64 0.21 requires 1.57
     name: ubuntu / ${{ matrix.msrv }}
     steps:
       - uses: actions/checkout@v3

.github/workflows/test.yml

@@ -122,6 +122,10 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest]
     steps:
+      - run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+        if: runner.os == 'Windows'
+      - run: vcpkg install openssl:x64-windows-static-md
+        if: runner.os == 'Windows'
       - uses: actions/checkout@v3
         with:
           submodules: true

Cargo.lock

@@ -26,7 +26,7 @@ regex = "1.0"
 bufstream = "0.1.3"
 imap-proto = "0.16.1"
 nom = { version = "7.1.0", default-features = false }
-base64 = "0.13"
+base64 = "0.21"
 chrono = { version = "0.4", default-features = false, features = ["std"]}
 lazy_static = "1.4"
 ouroboros = "0.15.0"
@@ -40,6 +40,7 @@ structopt = "0.3"
 encoding = "0.2.32"
 failure = "0.1.8"
 mime = "0.3.4"
+openssl = "0.10.35"
 
 [[example]]
 name = "basic"

Cargo.toml

@@ -1,3 +1,4 @@
+use base64::{engine::general_purpose, Engine as _};
 use bufstream::BufStream;
 use chrono::{DateTime, FixedOffset};
 use imap_proto::Response;
@@ -471,16 +472,18 @@ impl<T: Read + Write> Client<T> {
                     let data =
                         ok_or_unauth_client_err!(parse_authenticate_response(line_str), self);
                     ok_or_unauth_client_err!(
-                        base64::decode(data).map_err(|e| Error::Parse(ParseError::Authentication(
-                            data.to_string(),
-                            Some(e)
-                        ))),
+                        general_purpose::STANDARD_NO_PAD
+                            .decode(data)
+                            .map_err(|e| Error::Parse(ParseError::Authentication(
+                                data.to_string(),
+                                Some(e)
+                            ))),
                         self
                     )
                 };
 
                 let raw_response = &authenticator.process(&challenge);
-                let auth_response = base64::encode(raw_response);
+                let auth_response = general_purpose::STANDARD_NO_PAD.encode(raw_response);
                 ok_or_unauth_client_err!(
                     self.write_line(auth_response.into_bytes().as_slice()),
                     self