De-enumify Nid

1 files changed, 10 insertions, 10 deletions

diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs
index a5eb04e7..2a5d51a2 100644
--- a/openssl/src/x509/tests.rs
+++ b/openssl/src/x509/tests.rs
@@ -20,7 +20,7 @@ fn get_generator() -> X509Generator {
                                         ServerAuth,
                                         ExtKeyUsageOption::Other("2.999.1".to_owned())]))
         .add_extension(SubjectAltName(vec![(SAN::DNS, "example.com".to_owned())]))
-        .add_extension(OtherNid(Nid::BasicConstraints, "critical,CA:TRUE".to_owned()))
+        .add_extension(OtherNid(Nid::basic_constraints(), "critical,CA:TRUE".to_owned()))
         .add_extension(OtherStr("2.999.2".to_owned(), "ASN1:UTF8:example value".to_owned()))
 }
 
@@ -48,8 +48,8 @@ fn test_cert_gen() {
 fn test_cert_gen_extension_ordering() {
     let pkey = pkey();
     get_generator()
-        .add_extension(OtherNid(Nid::SubjectKeyIdentifier, "hash".to_owned()))
-        .add_extension(OtherNid(Nid::AuthorityKeyIdentifier, "keyid:always".to_owned()))
+        .add_extension(OtherNid(Nid::subject_key_identifier(), "hash".to_owned()))
+        .add_extension(OtherNid(Nid::authority_key_identifier(), "keyid:always".to_owned()))
         .sign(&pkey)
         .expect("Failed to generate cert with order-dependent extensions");
 }
@@ -60,9 +60,9 @@ fn test_cert_gen_extension_ordering() {
 fn test_cert_gen_extension_bad_ordering() {
     let pkey = pkey();
     let result = get_generator()
-                     .add_extension(OtherNid(Nid::AuthorityKeyIdentifier,
+                     .add_extension(OtherNid(Nid::authority_key_identifier(),
                                              "keyid:always".to_owned()))
-                     .add_extension(OtherNid(Nid::SubjectKeyIdentifier, "hash".to_owned()))
+                     .add_extension(OtherNid(Nid::subject_key_identifier(), "hash".to_owned()))
                      .sign(&pkey);
 
     assert!(result.is_err());
@@ -116,7 +116,7 @@ fn test_subject_read_cn() {
     let cert = include_bytes!("../../test/cert.pem");
     let cert = X509::from_pem(cert).ok().expect("Failed to load PEM");
     let subject = cert.subject_name();
-    let cn = match subject.text_by_nid(Nid::CN) {
+    let cn = match subject.text_by_nid(Nid::commonName()) {
         Some(x) => x,
         None => panic!("Failed to read CN from cert"),
     };
@@ -130,19 +130,19 @@ fn test_nid_values() {
     let cert = X509::from_pem(cert).ok().expect("Failed to load PEM");
     let subject = cert.subject_name();
 
-    let cn = match subject.text_by_nid(Nid::CN) {
+    let cn = match subject.text_by_nid(Nid::commonName()) {
         Some(x) => x,
         None => panic!("Failed to read CN from cert"),
     };
     assert_eq!(&cn as &str, "example.com");
 
-    let email = match subject.text_by_nid(Nid::Email) {
+    let email = match subject.text_by_nid(Nid::pkcs9_emailAddress()) {
         Some(x) => x,
         None => panic!("Failed to read subject email address from cert"),
     };
     assert_eq!(&email as &str, "[email protected]");
 
-    let friendly = match subject.text_by_nid(Nid::FriendlyName) {
+    let friendly = match subject.text_by_nid(Nid::friendlyName()) {
         Some(x) => x,
         None => panic!("Failed to read subject friendly name from cert"),
     };
@@ -155,7 +155,7 @@ fn test_nid_uid_value() {
     let cert = X509::from_pem(cert).ok().expect("Failed to load PEM");
     let subject = cert.subject_name();
 
-    let cn = match subject.text_by_nid(Nid::UserId) {
+    let cn = match subject.text_by_nid(Nid::userId()) {
         Some(x) => x,
         None => panic!("Failed to read UID from cert"),
     };