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

Merge pull request #2081 from Arnavion/nid_chacha20_poly1305 

Add binding to NID of Chacha20-Poly1305 cipher
parents bede98ba 05b620dd

openssl-sys/src/obj_mac.rs

+4 −0
Original line number Diff line number Diff line
@@ -996,3 +996,7 @@ pub const NID_sha3_512: c_int = 1034; 
pub const NID_shake128: c_int = 1100;

#[cfg(ossl111)]

pub const NID_shake256: c_int = 1101;

#[cfg(ossl110)]

pub const NID_chacha20_poly1305: c_int = 1018;

#[cfg(libressl271)]

pub const NID_chacha20_poly1305: c_int = 967;

openssl/src/nid.rs

+2 −0
Original line number Diff line number Diff line
@@ -1090,6 +1090,8 @@ impl Nid { 
    pub const SHAKE128: Nid = Nid(ffi::NID_shake128);

    #[cfg(ossl111)]

    pub const SHAKE256: Nid = Nid(ffi::NID_shake256);

    #[cfg(any(ossl110, libressl271))]

    pub const CHACHA20_POLY1305: Nid = Nid(ffi::NID_chacha20_poly1305);

}



#[cfg(test)]