Move to associated consts

2 files changed, 10 insertions, 10 deletions

diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index faf93780..69d17f86 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -16,7 +16,7 @@ use std::str;
 use {cvt, cvt_n, cvt_p};
 use asn1::{Asn1BitStringRef, Asn1IntegerRef, Asn1ObjectRef, Asn1StringRef, Asn1Time, Asn1TimeRef};
 use bio::MemBioSlice;
-use bn::{BigNum, MSB_MAYBE_ZERO};
+use bn::{BigNum, MsbOption};
 use conf::ConfRef;
 use error::ErrorStack;
 use hash::MessageDigest;
@@ -50,11 +50,11 @@ impl X509FileType {
     pub fn as_raw(&self) -> c_int {
         self.0
     }
-}
 
-pub const X509_FILETYPE_PEM: X509FileType = X509FileType(ffi::X509_FILETYPE_PEM);
-pub const X509_FILETYPE_ASN1: X509FileType = X509FileType(ffi::X509_FILETYPE_ASN1);
-pub const X509_FILETYPE_DEFAULT: X509FileType = X509FileType(ffi::X509_FILETYPE_DEFAULT);
+    pub const PEM: X509FileType = X509FileType(ffi::X509_FILETYPE_PEM);
+    pub const ASN1: X509FileType = X509FileType(ffi::X509_FILETYPE_ASN1);
+    pub const DEFAULT: X509FileType = X509FileType(ffi::X509_FILETYPE_DEFAULT);
+}
 
 foreign_type_and_impl_send_sync! {
     type CType = ffi::X509_STORE_CTX;
@@ -224,7 +224,7 @@ impl X509Generator {
         builder.set_version(2)?;
 
         let mut serial = BigNum::new()?;
-        serial.rand(128, MSB_MAYBE_ZERO, false)?;
+        serial.rand(128, MsbOption::MAYBE_ZERO, false)?;
         let serial = serial.to_asn1_integer()?;
         builder.set_serial_number(&serial)?;
 
diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs
index 543cf7f2..1ad0218c 100644
--- a/openssl/src/x509/tests.rs
+++ b/openssl/src/x509/tests.rs
@@ -1,8 +1,8 @@
 use hex::{FromHex, ToHex};
 
 use asn1::Asn1Time;
-use bn::{BigNum, MSB_MAYBE_ZERO};
-use ec::{EcGroup, EcKey, NAMED_CURVE};
+use bn::{BigNum, MsbOption};
+use ec::{Asn1Flag, EcGroup, EcKey};
 use hash::MessageDigest;
 use nid::Nid;
 use pkey::PKey;
@@ -246,7 +246,7 @@ fn x509_builder() {
     builder.set_pubkey(&pkey).unwrap();
 
     let mut serial = BigNum::new().unwrap();
-    serial.rand(128, MSB_MAYBE_ZERO, false).unwrap();
+    serial.rand(128, MsbOption::MAYBE_ZERO, false).unwrap();
     builder
         .set_serial_number(&serial.to_asn1_integer().unwrap())
         .unwrap();
@@ -361,7 +361,7 @@ fn issued() {
 #[test]
 fn ecdsa_cert() {
     let mut group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
-    group.set_asn1_flag(NAMED_CURVE);
+    group.set_asn1_flag(Asn1Flag::NAMED_CURVE);
     let key = EcKey::generate(&group).unwrap();
     let key = PKey::from_ec_key(key).unwrap();