Unverified Commit 84162bf7 authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2144 from trail-of-forks/deterministic-nonce 

Add support for setting the nonce type and digest on a PKEY_CTX
parents 5e10531a 14c82479

openssl-sys/CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 


## [Unreleased]



### Added



* Added `OSSL_PARAM`, `OSSL_PARAM_construct_uint` , `OSSL_PARAM_construct_end`.

* Added `EVP_PKEY_CTX_set_params` and `EVP_PKEY_CTX_get_params`.



## [v0.9.99] - 2024-01-19



### Added

openssl-sys/src/handwritten/evp.rs

+6 −0
Original line number Diff line number Diff line
@@ -538,6 +538,12 @@ extern "C" { 
    #[cfg(ossl300)]

    pub fn EVP_PKEY_CTX_set_signature_md(ctx: *mut EVP_PKEY_CTX, md: *const EVP_MD) -> c_int;



    #[cfg(ossl300)]

    pub fn EVP_PKEY_CTX_set_params(ctx: *mut EVP_PKEY_CTX, params: *const OSSL_PARAM) -> c_int;



    #[cfg(ossl300)]

    pub fn EVP_PKEY_CTX_get_params(ctx: *mut EVP_PKEY_CTX, params: *mut OSSL_PARAM) -> c_int;



    pub fn EVP_PKEY_new_mac_key(

        type_: c_int,

        e: *mut ENGINE,

openssl-sys/src/handwritten/mod.rs

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ pub use self::hmac::*; 
pub use self::kdf::*;

pub use self::object::*;

pub use self::ocsp::*;

pub use self::params::*;

pub use self::pem::*;

pub use self::pkcs12::*;

pub use self::pkcs7::*;
@@ -51,6 +52,7 @@ mod hmac; 
mod kdf;

mod object;

mod ocsp;

mod params;

mod pem;

mod pkcs12;

mod pkcs7;

openssl-sys/src/handwritten/params.rs

0 → 100644
+9 −0
Original line number Diff line number Diff line 
use super::super::*;

use libc::*;



extern "C" {

    #[cfg(ossl300)]

    pub fn OSSL_PARAM_construct_uint(key: *const c_char, buf: *mut c_uint) -> OSSL_PARAM;

    #[cfg(ossl300)]

    pub fn OSSL_PARAM_construct_end() -> OSSL_PARAM;

}

openssl-sys/src/handwritten/types.rs

+10 −0
Original line number Diff line number Diff line
@@ -1093,3 +1093,13 @@ pub enum OSSL_PROVIDER {} 


#[cfg(ossl300)]

pub enum OSSL_LIB_CTX {}



#[cfg(ossl300)]

#[repr(C)]

pub struct OSSL_PARAM {

    key: *const c_char,

    data_type: c_uchar,

    data: *mut c_void,

    data_size: size_t,

    return_size: size_t,

}