Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@

# Changes

## Unreleased

- Remove `TryFrom<[u8]>` and `TryFrom<Vec<u8>>` for `KeyPair` in favor of allowing `KeyPair::from_der` to take `impl Into<Cow<'b, [u8]>>` which allows `Vec<u8>` as well as `[u8]`.
- Add `ring::rand::SecureRandom` parameter to:
- `KeyPair::generate`
- `KeyPair::from_der`
- `KeyPair::from_der_and_sign_algo`
- `KeyPair::from_pem`
- `KeyPair::from_pem_and_sign_algo`

## Release 0.10.0 - September 29, 2022

- Update x509-parser to 0.14.
Expand Down
39 changes: 32 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ required-features = ["pem"]

[dependencies]
yasna = { version = "0.5", features = ["time", "std"] }
ring = "0.16"
ring = { git = "https://github.com/briansmith/ring" }
pem = { version = "1.0", optional = true }
time = { version = "0.3.6", default-features = false }
x509-parser = { version = "0.14", features = ["verify"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/rsa-irc-openssl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {

let pkey :openssl::pkey::PKey<_> = openssl::rsa::Rsa::generate(2048)?.try_into()?;
let key_pair_pem = String::from_utf8(pkey.private_key_to_pem_pkcs8()?)?;
let key_pair = rcgen::KeyPair::from_pem(&key_pair_pem)?;
let key_pair = rcgen::KeyPair::from_pem(&key_pair_pem, &ring::rand::SystemRandom::new())?;
params.key_pair = Some(key_pair);

let cert = Certificate::from_params(params)?;
Expand Down
3 changes: 1 addition & 2 deletions examples/rsa-irc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use rand::rngs::OsRng;
use rcgen::{Certificate, CertificateParams,
DistinguishedName, date_time_ymd};
use std::fs;
use std::convert::TryFrom;

fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut params :CertificateParams = Default::default();
Expand All @@ -21,7 +20,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let bits = 2048;
let private_key = RsaPrivateKey::new(&mut rng, bits)?;
let private_key_der = private_key.to_pkcs8_der()?;
let key_pair = rcgen::KeyPair::try_from(private_key_der.as_ref()).unwrap();
let key_pair = rcgen::KeyPair::from_der(private_key_der.as_ref(), &ring::rand::SystemRandom::new()).unwrap();
params.key_pair = Some(key_pair);

let cert = Certificate::from_params(params)?;
Expand Down
Loading