|
@@ -997,14 +997,14 @@ CF_INLINE CFStringRef getsubject(SecCertificateRef cert)
|
|
|
#else
|
|
|
#if CURL_BUILD_MAC_10_7
|
|
|
/* Lion & later: Get the long description if we can. */
|
|
|
- if(SecCertificateCopyLongDescription != NULL)
|
|
|
+ if(SecCertificateCopyLongDescription)
|
|
|
server_cert_summary =
|
|
|
SecCertificateCopyLongDescription(NULL, cert, NULL);
|
|
|
else
|
|
|
#endif /* CURL_BUILD_MAC_10_7 */
|
|
|
#if CURL_BUILD_MAC_10_6
|
|
|
/* Snow Leopard: Get the certificate summary. */
|
|
|
- if(SecCertificateCopySubjectSummary != NULL)
|
|
|
+ if(SecCertificateCopySubjectSummary)
|
|
|
server_cert_summary = SecCertificateCopySubjectSummary(cert);
|
|
|
else
|
|
|
#endif /* CURL_BUILD_MAC_10_6 */
|
|
@@ -1118,7 +1118,7 @@ static OSStatus CopyIdentityWithLabel(char *label,
|
|
|
/* SecItemCopyMatching() was introduced in iOS and Snow Leopard.
|
|
|
kSecClassIdentity was introduced in Lion. If both exist, let's use them
|
|
|
to find the certificate. */
|
|
|
- if(SecItemCopyMatching != NULL && kSecClassIdentity != NULL) {
|
|
|
+ if(SecItemCopyMatching && kSecClassIdentity) {
|
|
|
CFTypeRef keys[5];
|
|
|
CFTypeRef values[5];
|
|
|
CFDictionaryRef query_dict;
|
|
@@ -1248,7 +1248,7 @@ static OSStatus CopyIdentityFromPKCS12File(const char *cPath,
|
|
|
CFDictionaryRef options = CFDictionaryCreate(NULL, cKeys, cValues,
|
|
|
password ? 1L : 0L, NULL, NULL);
|
|
|
|
|
|
- if(options != NULL) {
|
|
|
+ if(options) {
|
|
|
status = SecPKCS12Import(pkcs_data, options, &items);
|
|
|
CFRelease(options);
|
|
|
}
|
|
@@ -1406,7 +1406,7 @@ set_ssl_version_min_max(struct Curl_easy *data, struct connectdata *conn,
|
|
|
}
|
|
|
|
|
|
#if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS
|
|
|
- if(SSLSetProtocolVersionMax != NULL) {
|
|
|
+ if(SSLSetProtocolVersionMax) {
|
|
|
SSLProtocol darwin_ver_min = kTLSProtocol1;
|
|
|
SSLProtocol darwin_ver_max = kTLSProtocol1;
|
|
|
CURLcode result = sectransp_version_from_curl(&darwin_ver_min,
|
|
@@ -1608,7 +1608,7 @@ static CURLcode sectransp_set_selected_ciphers(struct Curl_easy *data,
|
|
|
if(tls_name) {
|
|
|
table_cipher_name = ciphertable[i].name;
|
|
|
}
|
|
|
- else if(ciphertable[i].alias_name != NULL) {
|
|
|
+ else if(ciphertable[i].alias_name) {
|
|
|
table_cipher_name = ciphertable[i].alias_name;
|
|
|
}
|
|
|
else {
|
|
@@ -1688,7 +1688,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data,
|
|
|
#endif /* CURL_BUILD_MAC */
|
|
|
|
|
|
#if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS
|
|
|
- if(SSLCreateContext != NULL) { /* use the newer API if available */
|
|
|
+ if(SSLCreateContext) { /* use the newer API if available */
|
|
|
if(backend->ssl_ctx)
|
|
|
CFRelease(backend->ssl_ctx);
|
|
|
backend->ssl_ctx = SSLCreateContext(NULL, kSSLClientSide, kSSLStreamType);
|
|
@@ -1722,7 +1722,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data,
|
|
|
|
|
|
/* check to see if we've been told to use an explicit SSL/TLS version */
|
|
|
#if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS
|
|
|
- if(SSLSetProtocolVersionMax != NULL) {
|
|
|
+ if(SSLSetProtocolVersionMax) {
|
|
|
switch(conn->ssl_config.version) {
|
|
|
case CURL_SSLVERSION_TLSv1:
|
|
|
(void)SSLSetProtocolVersionMin(backend->ssl_ctx, kTLSProtocol1);
|
|
@@ -1980,9 +1980,9 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data,
|
|
|
Darwin 15.x.x is El Capitan (10.11)
|
|
|
*/
|
|
|
#if CURL_BUILD_MAC
|
|
|
- if(SSLSetSessionOption != NULL && darwinver_maj >= 13) {
|
|
|
+ if(SSLSetSessionOption && darwinver_maj >= 13) {
|
|
|
#else
|
|
|
- if(SSLSetSessionOption != NULL) {
|
|
|
+ if(SSLSetSessionOption) {
|
|
|
#endif /* CURL_BUILD_MAC */
|
|
|
bool break_on_auth = !conn->ssl_config.verifypeer ||
|
|
|
ssl_cafile || ssl_cablob;
|
|
@@ -2065,7 +2065,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data,
|
|
|
#if CURL_BUILD_MAC_10_9 || CURL_BUILD_IOS_7
|
|
|
/* We want to enable 1/n-1 when using a CBC cipher unless the user
|
|
|
specifically doesn't want us doing that: */
|
|
|
- if(SSLSetSessionOption != NULL) {
|
|
|
+ if(SSLSetSessionOption) {
|
|
|
SSLSetSessionOption(backend->ssl_ctx, kSSLSessionOptionSendOneByteRecord,
|
|
|
!SSL_SET_OPTION(enable_beast));
|
|
|
SSLSetSessionOption(backend->ssl_ctx, kSSLSessionOptionFalseStart,
|
|
@@ -2521,7 +2521,7 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data,
|
|
|
} while(0);
|
|
|
|
|
|
Curl_safefree(realpubkey);
|
|
|
- if(publicKeyBits != NULL)
|
|
|
+ if(publicKeyBits)
|
|
|
CFRelease(publicKeyBits);
|
|
|
|
|
|
return result;
|
|
@@ -2947,7 +2947,7 @@ collect_server_cert(struct Curl_easy *data,
|
|
|
private API and doesn't work as expected. So we have to look for
|
|
|
a different symbol to make sure this code is only executed under
|
|
|
Lion or later. */
|
|
|
- if(SecTrustEvaluateAsync != NULL) {
|
|
|
+ if(SecTrustEvaluateAsync) {
|
|
|
#pragma unused(server_certs)
|
|
|
err = SSLCopyPeerTrust(backend->ssl_ctx, &trust);
|
|
|
/* For some reason, SSLCopyPeerTrust() can return noErr and yet return
|
|
@@ -3165,7 +3165,7 @@ static void sectransp_close(struct Curl_easy *data, struct connectdata *conn,
|
|
|
if(backend->ssl_ctx) {
|
|
|
(void)SSLClose(backend->ssl_ctx);
|
|
|
#if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS
|
|
|
- if(SSLCreateContext != NULL)
|
|
|
+ if(SSLCreateContext)
|
|
|
CFRelease(backend->ssl_ctx);
|
|
|
#if CURL_SUPPORT_MAC_10_8
|
|
|
else
|
|
@@ -3329,7 +3329,7 @@ static CURLcode sectransp_sha256sum(const unsigned char *tmp, /* input */
|
|
|
static bool sectransp_false_start(void)
|
|
|
{
|
|
|
#if CURL_BUILD_MAC_10_9 || CURL_BUILD_IOS_7
|
|
|
- if(SSLSetSessionOption != NULL)
|
|
|
+ if(SSLSetSessionOption)
|
|
|
return TRUE;
|
|
|
#endif
|
|
|
return FALSE;
|