aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/crypto
diff options
context:
space:
mode:
authorAlex Crichton <[email protected]>2015-04-02 18:14:51 -0700
committerAlex Crichton <[email protected]>2015-04-02 18:14:51 -0700
commit293f1ce5b19610255f4fe3a69cf8fd159a0d5820 (patch)
tree334537900cf3d6d55e3b980e69375a407ff0868c /openssl/src/crypto
parentRemove two features (diff)
downloadrust-openssl-293f1ce5b19610255f4fe3a69cf8fd159a0d5820.tar.xz
rust-openssl-293f1ce5b19610255f4fe3a69cf8fd159a0d5820.zip
Fixup for beta
Add derive(Clone) and don't negate unsigned numbers
Diffstat (limited to 'openssl/src/crypto')
-rw-r--r--openssl/src/crypto/hash.rs4
-rw-r--r--openssl/src/crypto/hmac.rs2
-rw-r--r--openssl/src/crypto/pkey.rs6
-rw-r--r--openssl/src/crypto/symm.rs4
4 files changed, 8 insertions, 8 deletions
diff --git a/openssl/src/crypto/hash.rs b/openssl/src/crypto/hash.rs
index 29e180e5..801d8ca5 100644
--- a/openssl/src/crypto/hash.rs
+++ b/openssl/src/crypto/hash.rs
@@ -6,7 +6,7 @@ use std::io;
use ffi;
/// Message digest (hash) type.
-#[derive(Copy)]
+#[derive(Copy, Clone)]
pub enum Type {
MD5,
SHA1,
@@ -51,7 +51,7 @@ impl Type {
}
}
-#[derive(PartialEq, Copy)]
+#[derive(PartialEq, Copy, Clone)]
enum State {
Reset,
Updated,
diff --git a/openssl/src/crypto/hmac.rs b/openssl/src/crypto/hmac.rs
index dace68aa..a59cb929 100644
--- a/openssl/src/crypto/hmac.rs
+++ b/openssl/src/crypto/hmac.rs
@@ -22,7 +22,7 @@ use std::io::prelude::*;
use crypto::hash::Type;
use ffi;
-#[derive(PartialEq, Copy)]
+#[derive(PartialEq, Copy, Clone)]
enum State {
Reset,
Updated,
diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs
index e23171ed..9bcc79b6 100644
--- a/openssl/src/crypto/pkey.rs
+++ b/openssl/src/crypto/pkey.rs
@@ -9,7 +9,7 @@ use crypto::hash::Type as HashType;
use ffi;
use ssl::error::{SslError, StreamError};
-#[derive(Copy)]
+#[derive(Copy, Clone)]
enum Parts {
Neither,
Public,
@@ -17,7 +17,7 @@ enum Parts {
}
/// Represents a role an asymmetric key might be appropriate for.
-#[derive(Copy)]
+#[derive(Copy, Clone)]
pub enum Role {
Encrypt,
Decrypt,
@@ -26,7 +26,7 @@ pub enum Role {
}
/// Type of encryption padding to use.
-#[derive(Copy)]
+#[derive(Copy, Clone)]
pub enum EncryptionPadding {
OAEP,
PKCS1v15
diff --git a/openssl/src/crypto/symm.rs b/openssl/src/crypto/symm.rs
index e8bbcf80..62208439 100644
--- a/openssl/src/crypto/symm.rs
+++ b/openssl/src/crypto/symm.rs
@@ -3,14 +3,14 @@ use libc::{c_int};
use ffi;
-#[derive(Copy)]
+#[derive(Copy, Clone)]
pub enum Mode {
Encrypt,
Decrypt,
}
#[allow(non_camel_case_types)]
-#[derive(Copy)]
+#[derive(Copy, Clone)]
pub enum Type {
AES_128_ECB,
AES_128_CBC,