diff --git a/Cargo.toml b/Cargo.toml index c56ff2a..aad328e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustls-openssl" authors = ["Tom Fay "] -version = "0.2.0" +version = "0.2.1" edition = "2021" license = "MIT" description = "Rustls crypto provider for OpenSSL" @@ -14,8 +14,7 @@ foreign-types = "0.3.1" once_cell = "1.8.0" openssl = "0.10.68" openssl-sys = "0.9.104" -rustls = { version = "0.23.0", default-features = false } -rustls-webpki = { version = "0.102.2", default-features = false } +rustls = { version = "0.23.20", default-features = false } zeroize = "1.8.1" [features] @@ -28,7 +27,7 @@ hex = "0.4.3" rcgen = { version = "0.13.1", default-features = false, features = [ "aws_lc_rs", ] } -rstest = "0.23.0" +rstest = "0.25.0" # Use aws_lc_rs to test our provider rustls = { version = "0.23.0", features = ["aws_lc_rs"] } rustls-pemfile = "2" @@ -37,5 +36,5 @@ wycheproof = { version = "0.6.0", default-features = false, features = [ "aead", "hkdf", "ecdh", - "xdh" + "xdh", ] } diff --git a/README.md b/README.md index c535e1d..6f706f7 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,10 @@ # rustls-openssl A [rustls Crypto Provider](https://docs.rs/rustls/latest/rustls/crypto/struct.CryptoProvider.html) that uses OpenSSL for cryptographic operations. -See the [documentation](https://docs.rs/rustls-openssl) for supported cipher suites and algorithms. +[Documentation](https://docs.rs/rustls-openssl). [![crates.io](https://img.shields.io/crates/v/rustls-openssl?style=flat-square&logo=rust)](https://crates.io/crates/rustls-openssl) [![Build Status](https://github.com/tofay/rustls-openssl/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/tofay/rustls-openssl/actions/workflows/ci.yml?query=branch%3Amain) [![Documentation](https://docs.rs/rustls-openssl/badge.svg)](https://docs.rs/rustls-openssl/) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) [![Coverage Status (codecov.io)](https://codecov.io/gh/tofay/rustls-openssl/branch/main/graph/badge.svg)](https://codecov.io/gh/tofay/rustls-openssl/) - -## Status -Early in development. diff --git a/src/verify.rs b/src/verify.rs index 62926eb..e552776 100644 --- a/src/verify.rs +++ b/src/verify.rs @@ -8,12 +8,12 @@ use openssl::{ rsa::{Padding, Rsa}, sign::{RsaPssSaltlen, Verifier}, }; +use rustls::pki_types::alg_id; use rustls::{ crypto::WebPkiSupportedAlgorithms, pki_types::{AlgorithmIdentifier, InvalidSignature, SignatureVerificationAlgorithm}, SignatureScheme, }; -use webpki::alg_id; /// A [WebPkiSupportedAlgorithms] value defining the supported signature algorithms. pub static SUPPORTED_SIG_ALGS: WebPkiSupportedAlgorithms = WebPkiSupportedAlgorithms { diff --git a/tests/it.rs b/tests/it.rs index 6c68b1f..314909c 100644 --- a/tests/it.rs +++ b/tests/it.rs @@ -9,13 +9,12 @@ use openssl::rsa::Rsa; use rstest::rstest; use rustls::crypto::{CryptoProvider, SupportedKxGroup}; use rustls::pki_types::pem::PemObject; -use rustls::pki_types::PrivateKeyDer; +use rustls::pki_types::{CertificateDer, PrivateKeyDer}; use rustls::{CipherSuite, SignatureScheme, SupportedCipherSuite}; use rustls_openssl::{custom_provider, default_provider}; use std::io::{Read, Write}; use std::net::TcpStream; use std::sync::Arc; -use webpki::types::CertificateDer; pub mod server;