Unverified Commit 3f3b26d6 authored by Han Han's avatar Han Han Committed by Daniel Stenberg
Browse files

ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code 

Long live CURLE_PEER_FAILED_VERIFICATION
parent 0029aabc

docs/libcurl/symbols-in-versions

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ CURLE_SEND_ERROR 7.10 
CURLE_SEND_FAIL_REWIND          7.12.3

CURLE_SHARE_IN_USE              7.9.6         7.17.0

CURLE_SSH                       7.16.1

CURLE_SSL_CACERT                7.10

CURLE_SSL_CACERT                7.10          7.62.0

CURLE_SSL_CACERT_BADFILE        7.16.0

CURLE_SSL_CERTPROBLEM           7.10

CURLE_SSL_CIPHER                7.10

include/curl/curl.h

+6 −3
Original line number Diff line number Diff line
@@ -517,8 +517,7 @@ typedef enum { 
  CURLE_UNKNOWN_OPTION,          /* 48 - User specified an unknown option */

  CURLE_TELNET_OPTION_SYNTAX,    /* 49 - Malformed telnet option */

  CURLE_OBSOLETE50,              /* 50 - NOT USED */

  CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint

                                     wasn't verified fine */

  CURLE_OBSOLETE51,              /* 51 - NOT USED */

  CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */

  CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */

  CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as
@@ -528,7 +527,8 @@ typedef enum { 
  CURLE_OBSOLETE57,              /* 57 - NOT IN USE */

  CURLE_SSL_CERTPROBLEM,         /* 58 - problem with the local certificate */

  CURLE_SSL_CIPHER,              /* 59 - couldn't use specified cipher */

  CURLE_SSL_CACERT,              /* 60 - problem with the CA cert (path?) */

  CURLE_PEER_FAILED_VERIFICATION, /* 60 - peer's certificate or fingerprint

                                     wasn't verified fine */

  CURLE_BAD_CONTENT_ENCODING,    /* 61 - Unrecognized/bad encoding */

  CURLE_LDAP_INVALID_URL,        /* 62 - Invalid LDAP URL */

  CURLE_FILESIZE_EXCEEDED,       /* 63 - Maximum file size exceeded */
@@ -584,6 +584,9 @@ typedef enum { 
  CURL_LAST /* never use! */

} CURLcode;



/* added in 7.62.0 */

#define CURLE_SSL_CACERT CURLE_PEER_FAILED_VERIFICATION



#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all

                          the obsolete stuff removed! */

lib/strerror.c

+3 −6
Original line number Diff line number Diff line
@@ -191,9 +191,6 @@ curl_easy_strerror(CURLcode error) 
  case CURLE_TELNET_OPTION_SYNTAX :

    return "Malformed telnet option";



  case CURLE_PEER_FAILED_VERIFICATION:

    return "SSL peer certificate or SSH remote key was not OK";



  case CURLE_GOT_NOTHING:

    return "Server returned nothing (no headers, no data)";
@@ -218,9 +215,8 @@ curl_easy_strerror(CURLcode error) 
  case CURLE_SSL_CIPHER:

    return "Couldn't use specified SSL cipher";



  case CURLE_SSL_CACERT:

    return "Peer certificate cannot be authenticated with given CA "

      "certificates";

  case CURLE_PEER_FAILED_VERIFICATION:

    return "SSL peer certificate or SSH remote key was not OK";



  case CURLE_SSL_CACERT_BADFILE:

    return "Problem with the SSL CA cert (path? access rights?)";
@@ -324,6 +320,7 @@ curl_easy_strerror(CURLcode error) 
  case CURLE_OBSOLETE44:

  case CURLE_OBSOLETE46:

  case CURLE_OBSOLETE50:

  case CURLE_OBSOLETE51:

  case CURLE_OBSOLETE57:

  case CURL_LAST:

    break;

lib/vtls/darwinssl.c

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ static int append_cert_to_array(struct Curl_easy *data, 
    switch(result) {

      case CURLE_OK:

        break;

      case CURLE_SSL_CACERT:

      case CURLE_PEER_FAILED_VERIFICATION:

        return CURLE_SSL_CACERT_BADFILE;

      case CURLE_OUT_OF_MEMORY:

      default:

lib/vtls/nss.c

+0 −1
Original line number Diff line number Diff line
@@ -1522,7 +1522,6 @@ static bool is_nss_error(CURLcode err) 
{

  switch(err) {

  case CURLE_PEER_FAILED_VERIFICATION:

  case CURLE_SSL_CACERT:

  case CURLE_SSL_CERTPROBLEM:

  case CURLE_SSL_CONNECT_ERROR:

  case CURLE_SSL_ISSUER_ERROR: