Juan Lang : crypt32: Remove an unnecessary if.
Alexandre Julliard
julliard at winehq.org
Wed Nov 18 09:40:39 CST 2009
Module: wine
Branch: master
Commit: f8044948bad5507fecdd0a3bdd5e409f010e3fa9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8044948bad5507fecdd0a3bdd5e409f010e3fa9
Author: Juan Lang <juan.lang at gmail.com>
Date: Mon Nov 16 18:12:16 2009 -0800
crypt32: Remove an unnecessary if.
---
dlls/crypt32/chain.c | 71 ++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
index 11010d5..89ce807 100644
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -778,50 +778,43 @@ static void CRYPT_CheckNameConstraints(
const CERT_NAME_CONSTRAINTS_INFO *nameConstraints, const CERT_INFO *cert,
DWORD *trustErrorStatus)
{
- /* If there aren't any existing constraints, don't bother checking */
- if (nameConstraints->cPermittedSubtree || nameConstraints->cExcludedSubtree)
+ CERT_EXTENSION *ext = get_subject_alt_name_ext(cert);
+
+ if (ext)
{
- CERT_EXTENSION *ext = get_subject_alt_name_ext(cert);
+ CERT_ALT_NAME_INFO *subjectName;
+ DWORD size;
- if (ext)
+ if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME,
+ ext->Value.pbData, ext->Value.cbData,
+ CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
+ &subjectName, &size))
{
- CERT_ALT_NAME_INFO *subjectName;
- DWORD size;
-
- if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME,
- ext->Value.pbData, ext->Value.cbData,
- CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
- &subjectName, &size))
- {
- DWORD i;
+ DWORD i;
- for (i = 0; i < nameConstraints->cExcludedSubtree; i++)
- CRYPT_FindMatchingNameEntry(
- &nameConstraints->rgExcludedSubtree[i].Base, subjectName,
- trustErrorStatus,
- CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0);
- for (i = 0; i < nameConstraints->cPermittedSubtree; i++)
- CRYPT_FindMatchingNameEntry(
- &nameConstraints->rgPermittedSubtree[i].Base, subjectName,
- trustErrorStatus, 0,
- CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT);
- LocalFree(subjectName);
- }
- else
- *trustErrorStatus |=
- CERT_TRUST_INVALID_EXTENSION |
- CERT_TRUST_INVALID_NAME_CONSTRAINTS;
+ for (i = 0; i < nameConstraints->cExcludedSubtree; i++)
+ CRYPT_FindMatchingNameEntry(
+ &nameConstraints->rgExcludedSubtree[i].Base, subjectName,
+ trustErrorStatus, CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, 0);
+ for (i = 0; i < nameConstraints->cPermittedSubtree; i++)
+ CRYPT_FindMatchingNameEntry(
+ &nameConstraints->rgPermittedSubtree[i].Base, subjectName,
+ trustErrorStatus, 0,
+ CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT);
+ LocalFree(subjectName);
}
else
- {
- if (nameConstraints->cPermittedSubtree)
- *trustErrorStatus |=
- CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
- CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;
- if (nameConstraints->cExcludedSubtree)
- *trustErrorStatus |=
- CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT;
- }
+ *trustErrorStatus |=
+ CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_INVALID_NAME_CONSTRAINTS;
+ }
+ else
+ {
+ if (nameConstraints->cPermittedSubtree)
+ *trustErrorStatus |=
+ CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT |
+ CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT;
+ if (nameConstraints->cExcludedSubtree)
+ *trustErrorStatus |= CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT;
}
}
More information about the wine-cvs
mailing list