Unverified Commit 93d172b1 authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2135 from alex/password-pem-public-key 

Allow passing a passphrase callback when loading a public key
parents 4c98550c d5b375a1

.github/workflows/ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ jobs: 
          run: |

            case "${{ matrix.library.name }}" in

            "openssl")

              url="https://openssl.org/source${{ matrix.library.dl-path }}/openssl-${{ matrix.library.version }}.tar.gz"

              url="https://www.openssl.org/source${{ matrix.library.dl-path }}/openssl-${{ matrix.library.version }}.tar.gz"

              tar_flags="--strip-components=1"

              ;;

            "libressl")

openssl/src/pkey.rs

+11 −1
Original line number Diff line number Diff line
@@ -747,12 +747,22 @@ impl PKey<Private> { 
}



impl PKey<Public> {

    from_pem! {

    private_key_from_pem! {

        /// Decodes a PEM-encoded SubjectPublicKeyInfo structure.

        ///

        /// The input should have a header of `-----BEGIN PUBLIC KEY-----`.

        #[corresponds(PEM_read_bio_PUBKEY)]

        public_key_from_pem,



        /// Decodes a PEM-encoded SubjectPublicKeyInfo structure.

        #[corresponds(PEM_read_bio_PUBKEY)]

        public_key_from_pem_passphrase,



        /// Decodes a PEM-encoded SubjectPublicKeyInfo structure.

        ///

        /// The callback should fill the password into the provided buffer and return its length.

        #[corresponds(PEM_read_bio_PrivateKey)]

        public_key_from_pem_callback,

        PKey<Public>,

        ffi::PEM_read_bio_PUBKEY

    }