From 2fd201d9c3df7fd76c0194fc10fa09cf5f0eb841 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 22 Oct 2016 10:08:21 -0700 Subject: De-enumify Nid --- openssl/src/x509/extension.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openssl/src/x509/extension.rs') diff --git a/openssl/src/x509/extension.rs b/openssl/src/x509/extension.rs index 99ef62c1..fc6b3c3b 100644 --- a/openssl/src/x509/extension.rs +++ b/openssl/src/x509/extension.rs @@ -71,10 +71,10 @@ impl Extension { impl ExtensionType { pub fn get_nid(&self) -> Option { match self { - &ExtensionType::KeyUsage => Some(Nid::KeyUsage), - &ExtensionType::ExtKeyUsage => Some(Nid::ExtendedKeyUsage), - &ExtensionType::SubjectAltName => Some(Nid::SubjectAltName), - &ExtensionType::IssuerAltName => Some(Nid::IssuerAltName), + &ExtensionType::KeyUsage => Some(Nid::key_usage()), + &ExtensionType::ExtKeyUsage => Some(Nid::ext_key_usage()), + &ExtensionType::SubjectAltName => Some(Nid::subject_alt_name()), + &ExtensionType::IssuerAltName => Some(Nid::issuer_alt_name()), &ExtensionType::OtherNid(nid) => Some(nid), &ExtensionType::OtherStr(_) => None, } -- cgit v1.2.3 From 787cad3c8225b0c09135305477d5a962fc64d9bb Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 22 Oct 2016 15:58:06 -0700 Subject: Use constants rather than constructors for Nid --- openssl/src/x509/extension.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'openssl/src/x509/extension.rs') diff --git a/openssl/src/x509/extension.rs b/openssl/src/x509/extension.rs index fc6b3c3b..7ac66383 100644 --- a/openssl/src/x509/extension.rs +++ b/openssl/src/x509/extension.rs @@ -1,6 +1,6 @@ use std::fmt; -use nid::Nid; +use nid::{self, Nid}; /// Type-only version of the `Extension` enum. /// @@ -71,10 +71,10 @@ impl Extension { impl ExtensionType { pub fn get_nid(&self) -> Option { match self { - &ExtensionType::KeyUsage => Some(Nid::key_usage()), - &ExtensionType::ExtKeyUsage => Some(Nid::ext_key_usage()), - &ExtensionType::SubjectAltName => Some(Nid::subject_alt_name()), - &ExtensionType::IssuerAltName => Some(Nid::issuer_alt_name()), + &ExtensionType::KeyUsage => Some(nid::KEY_USAGE), + &ExtensionType::ExtKeyUsage => Some(nid::EXT_KEY_USAGE), + &ExtensionType::SubjectAltName => Some(nid::SUBJECT_ALT_NAME), + &ExtensionType::IssuerAltName => Some(nid::ISSUER_ALT_NAME), &ExtensionType::OtherNid(nid) => Some(nid), &ExtensionType::OtherStr(_) => None, } -- cgit v1.2.3 From d39a2cedad749c47e3fabe7701cd1134568e5cfd Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 22 Oct 2016 16:01:26 -0700 Subject: Fix tests --- openssl/src/x509/extension.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openssl/src/x509/extension.rs') diff --git a/openssl/src/x509/extension.rs b/openssl/src/x509/extension.rs index 7ac66383..398bbb3e 100644 --- a/openssl/src/x509/extension.rs +++ b/openssl/src/x509/extension.rs @@ -36,10 +36,10 @@ pub enum Extension { /// /// ``` /// use openssl::x509::extension::Extension::*; - /// use openssl::nid::Nid; + /// use openssl::nid; /// /// # let generator = openssl::x509::X509Generator::new(); - /// generator.add_extension(OtherNid(Nid::BasicConstraints,"critical,CA:TRUE".to_owned())); + /// generator.add_extension(OtherNid(nid::BASIC_CONSTRAINTS,"critical,CA:TRUE".to_owned())); /// ``` OtherNid(Nid, String), /// Arbitrary extensions by OID string. See `man ASN1_generate_nconf` for value syntax. -- cgit v1.2.3