Fixed compilation errors related to namedspaced enums

2 files changed, 28 insertions, 26 deletions

diff --git a/src/x509/mod.rs b/src/x509/mod.rs
index 48b5d455..21c3a9d6 100644
--- a/src/x509/mod.rs
+++ b/src/x509/mod.rs
@@ -4,7 +4,7 @@ use std::ptr;
 
 use asn1::{Asn1Time};
 use bio::{MemBio};
-use crypto::hash::{HashType, evpmd, SHA1};
+use crypto::hash::{HashType, evpmd};
 use crypto::pkey::{PKey};
 use crypto::rand::rand_bytes;
 use ffi;
@@ -69,15 +69,15 @@ pub enum KeyUsage {
 impl AsStr<'static> for KeyUsage {
     fn as_str(&self) -> &'static str {
         match self {
-            &DigitalSignature => "digitalSignature",
-            &NonRepudiation => "nonRepudiation",
-            &KeyEncipherment => "keyEncipherment",
-            &DataEncipherment => "dataEncipherment",
-            &KeyAgreement => "keyAgreement",
-            &KeyCertSign => "keyCertSign",
-            &CRLSign => "cRLSign",
-            &EncipherOnly => "encipherOnly",
-            &DecipherOnly => "decipherOnly"
+            &KeyUsage::DigitalSignature => "digitalSignature",
+            &KeyUsage::NonRepudiation => "nonRepudiation",
+            &KeyUsage::KeyEncipherment => "keyEncipherment",
+            &KeyUsage::DataEncipherment => "dataEncipherment",
+            &KeyUsage::KeyAgreement => "keyAgreement",
+            &KeyUsage::KeyCertSign => "keyCertSign",
+            &KeyUsage::CRLSign => "cRLSign",
+            &KeyUsage::EncipherOnly => "encipherOnly",
+            &KeyUsage::DecipherOnly => "decipherOnly"
         }
     }
 }
@@ -101,17 +101,17 @@ pub enum ExtKeyUsage {
 impl AsStr<'static> for ExtKeyUsage {
     fn as_str(&self) -> &'static str {
         match self {
-            &ServerAuth => "serverAuth",
-            &ClientAuth => "clientAuth",
-            &CodeSigning => "codeSigning",
-            &EmailProtection => "emailProtection",
-            &TimeStamping => "timeStamping",
-            &MsCodeInd => "msCodeInd",
-            &MsCodeCom => "msCodeCom",
-            &MsCtlSign => "msCTLSign",
-            &MsSgc => "msSGC",
-            &MsEfs => "msEFS",
-            &NsSgc =>"nsSGC"
+            &ExtKeyUsage::ServerAuth => "serverAuth",
+            &ExtKeyUsage::ClientAuth => "clientAuth",
+            &ExtKeyUsage::CodeSigning => "codeSigning",
+            &ExtKeyUsage::EmailProtection => "emailProtection",
+            &ExtKeyUsage::TimeStamping => "timeStamping",
+            &ExtKeyUsage::MsCodeInd => "msCodeInd",
+            &ExtKeyUsage::MsCodeCom => "msCodeCom",
+            &ExtKeyUsage::MsCtlSign => "msCTLSign",
+            &ExtKeyUsage::MsSgc => "msSGC",
+            &ExtKeyUsage::MsEfs => "msEFS",
+            &ExtKeyUsage::NsSgc =>"nsSGC"
         }
     }
 }
@@ -192,7 +192,7 @@ impl X509Generator {
             CN: "rust-openssl".to_string(),
             key_usage: Vec::new(),
             ext_key_usage: Vec::new(),
-            hash_type: SHA1
+            hash_type: HashType::SHA1
         }
     }
 
@@ -435,8 +435,8 @@ macro_rules! make_validation_error(
             pub fn from_raw(err: c_int) -> Option<X509ValidationError> {
                 match err {
                     ffi::$ok_val => None,
-                    $(ffi::$val => Some($name),)+
-                    err => Some(X509UnknownError(err))
+                    $(ffi::$val => Some(X509ValidationError::$name),)+
+                    err => Some(X509ValidationError::X509UnknownError(err))
                 }
             }
         }
diff --git a/src/x509/tests.rs b/src/x509/tests.rs
index e4f7b142..49e399d9 100644
--- a/src/x509/tests.rs
+++ b/src/x509/tests.rs
@@ -2,8 +2,10 @@ use serialize::hex::FromHex;
 use std::io::{File, Open, Read};
 use std::io::util::NullWriter;
 
-use crypto::hash::{SHA256};
-use x509::{X509, X509Generator, DigitalSignature, KeyEncipherment, ClientAuth, ServerAuth};
+use crypto::hash::HashType::{SHA256};
+use x509::{X509, X509Generator};
+use x509::KeyUsage::{DigitalSignature, KeyEncipherment};
+use x509::ExtKeyUsage::{ClientAuth, ServerAuth};
 
 #[test]
 fn test_cert_gen() {