aboutsummaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-06-26 22:31:10 -0700
committerGitHub <[email protected]>2018-06-26 22:31:10 -0700
commit07c49e517ec577a2624aa139404f0b7d76fe30e2 (patch)
treee90ec17e5c85b595fb1dcf94164e882d2ed023ea /openssl
parentRename X509NameRef::all_entries and refactor end-of-iterator checks (diff)
downloadrust-openssl-07c49e517ec577a2624aa139404f0b7d76fe30e2.tar.xz
rust-openssl-07c49e517ec577a2624aa139404f0b7d76fe30e2.zip
Only grab the name entry count when needed
Diffstat (limited to 'openssl')
-rw-r--r--openssl/src/x509/mod.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
index 0b6c6b3d..3cfb0856 100644
--- a/openssl/src/x509/mod.rs
+++ b/openssl/src/x509/mod.rs
@@ -847,8 +847,6 @@ impl<'a> Iterator for X509NameEntries<'a> {
fn next(&mut self) -> Option<&'a X509NameEntryRef> {
unsafe {
- let entry_count = ffi::X509_NAME_entry_count(self.name.as_ptr());
-
match self.nid {
Some(nid) => {
// There is a `Nid` specified to search for
@@ -861,7 +859,7 @@ impl<'a> Iterator for X509NameEntries<'a> {
None => {
// Iterate over all `Nid`s
self.loc += 1;
- if self.loc >= entry_count {
+ if self.loc >= ffi::X509_NAME_entry_count(self.name.as_ptr()) {
return None;
}
}