Unverified Commit 0c50e4a4 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1897 from reaperhulk/poly1305 

add poly1305 EVP_PKEY type
parents 252f22d2 1c46f360

openssl-sys/src/evp.rs

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ pub const EVP_PKEY_X448: c_int = NID_X448; 
pub const EVP_PKEY_ED448: c_int = NID_ED448;

pub const EVP_PKEY_HMAC: c_int = NID_hmac;

pub const EVP_PKEY_CMAC: c_int = NID_cmac;

#[cfg(ossl111)]

pub const EVP_PKEY_POLY1305: c_int = NID_poly1305;

#[cfg(ossl110)]

pub const EVP_PKEY_HKDF: c_int = NID_hkdf;

openssl-sys/src/obj_mac.rs

+2 −0
Original line number Diff line number Diff line
@@ -927,6 +927,8 @@ pub const NID_X448: c_int = 1035; 
#[cfg(ossl110)]

pub const NID_hkdf: c_int = 1036;

#[cfg(ossl111)]

pub const NID_poly1305: c_int = 1061;

#[cfg(ossl111)]

pub const NID_ED25519: c_int = 1087;

#[cfg(libressl370)]

pub const NID_ED25519: c_int = 952;

openssl/src/pkey.rs

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ impl Id { 
    pub const X25519: Id = Id(ffi::EVP_PKEY_X25519);

    #[cfg(ossl111)]

    pub const X448: Id = Id(ffi::EVP_PKEY_X448);

    #[cfg(ossl111)]

    pub const POLY1305: Id = Id(ffi::EVP_PKEY_POLY1305);



    /// Creates a `Id` from an integer representation.

    pub fn from_raw(value: c_int) -> Id {