Commit 5682c044 authored by Charlie Ozinga's avatar Charlie Ozinga
Browse files

Remove des_cfb and des_ofb, since they appear on limit platforms

parent 2062d48d
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -529,8 +529,6 @@ extern "C" {

    pub fn EVP_des_cbc() -> *const EVP_CIPHER;
    pub fn EVP_des_ecb() -> *const EVP_CIPHER;
    pub fn EVP_des_cfb() -> *const EVP_CIPHER;
    pub fn EVP_des_ofb() -> *const EVP_CIPHER;

    pub fn EVP_BytesToKey(typ: *const EVP_CIPHER, md: *const EVP_MD,
                          salt: *const u8, data: *const u8, datalen: c_int,
+0 −24
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ pub enum Type {

    DES_CBC,
    DES_ECB,
    DES_CFB,
    DES_OFB,

    RC4_128,
}
@@ -389,26 +387,4 @@ mod tests {

        cipher_test(super::Type::DES_ECB, pt, ct, key, iv);
    }

    #[test]
    fn test_des_cfb() {

        let pt = "54686973206973206120746573742e";
        let ct = "10577dc484ebfe7679121dff761797";
        let key = "7cb66337f3d3c0fe";
        let iv = "0001020304050607";

        cipher_test(super::Type::DES_CFB, pt, ct, key, iv);
    }

    #[test]
    fn test_des_ofb() {

        let pt = "54686973206973206120746573742e";
        let ct = "10577dc484ebfe76be391c7b8a6b9d";
        let key = "7cb66337f3d3c0fe";
        let iv = "0001020304050607";

        cipher_test(super::Type::DES_OFB, pt, ct, key, iv);
    }
}
+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ pub fn evpc(t: symm::Type) -> (*const ffi::EVP_CIPHER, u32, u32) {

            symm::Type::DES_CBC => (ffi::EVP_des_cbc(), 8, 8),
            symm::Type::DES_ECB => (ffi::EVP_des_ecb(), 8, 8),
            symm::Type::DES_CFB => (ffi::EVP_des_cfb(), 8, 8),
            symm::Type::DES_OFB => (ffi::EVP_des_ofb(), 8, 8),

            symm::Type::RC4_128 => (ffi::EVP_rc4(), 16, 0),
        }