min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Issuer Alternative Name extension

This commit is contained in:
Jethro Beekman 2015-06-30 23:13:30 -07:00
parent f4168b1161
commit e9cc8cb121
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openssl/src/x509/extension.rs
View File

@ -6,6 +6,7 @@ pub enum ExtensionType {
KeyUsage, KeyUsage,
ExtKeyUsage, ExtKeyUsage,
SubjectAltName, SubjectAltName,
IssuerAltName,
OtherNid(Nid), OtherNid(Nid),
OtherStr(String), OtherStr(String),
} }
@ -15,6 +16,7 @@ pub enum Extension {
KeyUsage(Vec<KeyUsageOption>), KeyUsage(Vec<KeyUsageOption>),
ExtKeyUsage(Vec<ExtKeyUsageOption>), ExtKeyUsage(Vec<ExtKeyUsageOption>),
SubjectAltName(Vec<(AltNameOption,String)>), SubjectAltName(Vec<(AltNameOption,String)>),
IssuerAltName(Vec<(AltNameOption,String)>),
OtherNid(Nid,String), OtherNid(Nid,String),
OtherStr(String,String), OtherStr(String,String),
} }
@ -25,6 +27,7 @@ impl Extension {
&Extension::KeyUsage(_) => ExtensionType::KeyUsage, &Extension::KeyUsage(_) => ExtensionType::KeyUsage,
&Extension::ExtKeyUsage(_) => ExtensionType::ExtKeyUsage, &Extension::ExtKeyUsage(_) => ExtensionType::ExtKeyUsage,
&Extension::SubjectAltName(_) => ExtensionType::SubjectAltName, &Extension::SubjectAltName(_) => ExtensionType::SubjectAltName,
&Extension::IssuerAltName(_) => ExtensionType::IssuerAltName,
&Extension::OtherNid(nid,_) => ExtensionType::OtherNid(nid), &Extension::OtherNid(nid,_) => ExtensionType::OtherNid(nid),
&Extension::OtherStr(ref s,_) => ExtensionType::OtherStr(s.clone()), &Extension::OtherStr(ref s,_) => ExtensionType::OtherStr(s.clone()),
} }
@ -37,6 +40,7 @@ impl ExtensionType {
&ExtensionType::KeyUsage => Some(Nid::KeyUsage), &ExtensionType::KeyUsage => Some(Nid::KeyUsage),
&ExtensionType::ExtKeyUsage => Some(Nid::ExtendedKeyUsage), &ExtensionType::ExtKeyUsage => Some(Nid::ExtendedKeyUsage),
&ExtensionType::SubjectAltName => Some(Nid::SubjectAltName), &ExtensionType::SubjectAltName => Some(Nid::SubjectAltName),
&ExtensionType::IssuerAltName => Some(Nid::IssuerAltName),
&ExtensionType::OtherNid(nid) => Some(nid), &ExtensionType::OtherNid(nid) => Some(nid),
&ExtensionType::OtherStr(_) => None, &ExtensionType::OtherStr(_) => None,
} }
@ -66,6 +70,7 @@ impl ToString for Extension {
&Extension::KeyUsage(ref purposes) => join(purposes.iter(),","), &Extension::KeyUsage(ref purposes) => join(purposes.iter(),","),
&Extension::ExtKeyUsage(ref purposes) => join(purposes.iter(),","), &Extension::ExtKeyUsage(ref purposes) => join(purposes.iter(),","),
&Extension::SubjectAltName(ref names) => join(names.iter().map(|&(ref opt,ref val)|opt.to_string()+":"+&val),","), &Extension::SubjectAltName(ref names) => join(names.iter().map(|&(ref opt,ref val)|opt.to_string()+":"+&val),","),
&Extension::IssuerAltName(ref names) => join(names.iter().map(|&(ref opt,ref val)|opt.to_string()+":"+&val),","),
&Extension::OtherNid(_,ref value) => value.clone(), &Extension::OtherNid(_,ref value) => value.clone(),
&Extension::OtherStr(_,ref value) => value.clone(), &Extension::OtherStr(_,ref value) => value.clone(),
} }