projects
/
shibboleth
/
cpp-xmltooling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert from NULL macro to nullptr.
[shibboleth/cpp-xmltooling.git]
/
xmltooling
/
security
/
OpenSSLTrustEngine.h
diff --git
a/xmltooling/security/OpenSSLTrustEngine.h
b/xmltooling/security/OpenSSLTrustEngine.h
index
a44cd56
..
6f3bacf
100644
(file)
--- a/
xmltooling/security/OpenSSLTrustEngine.h
+++ b/
xmltooling/security/OpenSSLTrustEngine.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-20
07
Internet2
+ * Copyright 2001-20
10
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-49,11
+49,13
@@
namespace xmltooling {
*
* @param e DOM to supply configuration for provider
*/
*
* @param e DOM to supply configuration for provider
*/
- OpenSSLTrustEngine(const
DOMElement* e=NULL) : X509TrustEngine(e) {}
+ OpenSSLTrustEngine(const
xercesc::DOMElement* e=nullptr);
public:
public:
- virtual ~OpenSSLTrustEngine() {}
-
+ virtual ~OpenSSLTrustEngine();
+
+ using X509TrustEngine::validate;
+
/**
* Determines whether an X.509 credential is valid with respect to the
* source of credentials supplied.
/**
* Determines whether an X.509 credential is valid with respect to the
* source of credentials supplied.
@@
-75,7
+77,7
@@
namespace xmltooling {
virtual bool validate(
X509* certEE, STACK_OF(X509)* certChain,
const CredentialResolver& credResolver,
virtual bool validate(
X509* certEE, STACK_OF(X509)* certChain,
const CredentialResolver& credResolver,
- CredentialCriteria* criteria=
NULL
+ CredentialCriteria* criteria=
nullptr
) const=0;
};
) const=0;
};