Commit 32e9275e authored by Nick Zitzmann's avatar Nick Zitzmann
Browse files

darwinssl: fix lint & build warnings in the previous commit

parent cd2cedf0
Loading
Loading
Loading
Loading
+33 −29
Original line number Diff line number Diff line
@@ -1332,6 +1332,7 @@ static CURLcode darwinssl_connect_step1(struct connectdata *conn,

  if(data->set.str[STRING_SSL_CAFILE]) {
    bool is_cert_file = is_file(data->set.str[STRING_SSL_CAFILE]);

    if(!is_cert_file) {
      failf(data, "SSL: can't load CA certificate file %s",
            data->set.str[STRING_SSL_CAFILE]);
@@ -1527,7 +1528,7 @@ static CURLcode darwinssl_connect_step1(struct connectdata *conn,
static int pem_to_der(const char *in, unsigned char **out, size_t *outlen)
{
  char *sep, *start, *end;
  int i, j, err;
  size_t i, j, err;
  size_t len;
  unsigned char *b64;

@@ -1564,7 +1565,7 @@ static int pem_to_der(const char *in, unsigned char **out, size_t *outlen)
  }
  b64[j] = '\0';

  err = (int)Curl_base64_decode((const char *)b64, out, outlen);
  err = Curl_base64_decode((const char *)b64, out, outlen);
  free(b64);
  if(err) {
    free(*out);
@@ -1576,7 +1577,8 @@ static int pem_to_der(const char *in, unsigned char **out, size_t *outlen)

static int read_cert(const char *file, unsigned char **out, size_t *outlen)
{
  int fd, ret, n, len = 0, cap = 512;
  int fd;
  ssize_t n, len = 0, cap = 512;
  size_t derlen;
  unsigned char buf[cap], *data, *der;

@@ -1596,7 +1598,8 @@ static int read_cert(const char *file, unsigned char **out, size_t *outlen)
      close(fd);
      free(data);
      return -1;
    } else if (n == 0) {
    }
    else if(n == 0) {
      close(fd);
      break;
    }
@@ -1690,7 +1693,8 @@ static int verify_cert(const char *cafile, struct SessionHandle *data,
  if(trust == NULL) {
    failf(data, "SSL: error getting certificate chain");
    return CURLE_OUT_OF_MEMORY;
  } else if (ret != noErr) {
  }
  else if(ret != noErr) {
    return sslerr_to_curlerr(data, ret);
  }