diff options
| author | Joe Wilm <[email protected]> | 2016-02-02 14:32:57 -0800 |
|---|---|---|
| committer | Joe Wilm <[email protected]> | 2016-02-02 14:32:57 -0800 |
| commit | fe0f8ea1d8f629933116ca119e1cb898dec46c66 (patch) | |
| tree | 898022769f1a1806a97f2c9d0c5baaa38709423c /openssl/src | |
| parent | Fix Nid::UID value (diff) | |
| download | rust-openssl-fe0f8ea1d8f629933116ca119e1cb898dec46c66.tar.xz rust-openssl-fe0f8ea1d8f629933116ca119e1cb898dec46c66.zip | |
Rename Nid uid/UID to prevent breakage
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/nid.rs | 6 | ||||
| -rw-r--r-- | openssl/src/x509/tests.rs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/openssl/src/nid.rs b/openssl/src/nid.rs index f835d9e6..bfcae15a 100644 --- a/openssl/src/nid.rs +++ b/openssl/src/nid.rs @@ -104,7 +104,8 @@ pub enum Nid { G, S, I, - uid, // uniqueIdentifier + /// uniqueIdentifier + UID, CrlDistributionPoints, RSA_NP_MD5, SN, @@ -170,5 +171,6 @@ pub enum Nid { ID_QT_UNOTICE, RC2_64_CBC, SMIMECaps, - UID = 458 // userId + /// Shown as UID in cert subject + UserId = 458 } diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs index dbca8b98..69ad37f8 100644 --- a/openssl/src/x509/tests.rs +++ b/openssl/src/x509/tests.rs @@ -151,7 +151,7 @@ fn test_nid_uid_value() { let cert = X509::from_pem(&mut file).ok().expect("Failed to load PEM"); let subject = cert.subject_name(); - let cn = match subject.text_by_nid(Nid::UID) { + let cn = match subject.text_by_nid(Nid::UserId) { Some(x) => x, None => panic!("Failed to read UID from cert"), }; |