Commit 3a24cb7b authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

x509asn1.c,x509asn1.h: new module to support ASN.1/X509 parsing & info extract 

Use from qssl backend
parent e839446c

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ 
  http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c	\

  curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c		\

  curl_sasl.c curl_schannel.c curl_multibyte.c curl_darwinssl.c		\

  hostcheck.c bundles.c conncache.c pipeline.c dotdot.c

  hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c



HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\

  progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
@@ -44,4 +44,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ 
  asyn.h curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h	\

  curl_ntlm_msgs.h curl_sasl.h curl_schannel.h curl_multibyte.h		\

  curl_darwinssl.h hostcheck.h bundles.h conncache.h curl_setup_once.h	\

  multihandle.h setup-vms.h pipeline.h dotdot.h
 
  multihandle.h setup-vms.h pipeline.h dotdot.h x509asn1.h

lib/hostcheck.c

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


#include "curl_setup.h"



#if defined(USE_SSLEAY) || defined(USE_AXTLS)

/* these two backends use functions from this file */

#if defined(USE_SSLEAY) || defined(USE_AXTLS) || defined(USE_QSOSSL)

/* these backends use functions from this file */



#include "hostcheck.h"

#include "rawstr.h"
@@ -93,4 +93,4 @@ int Curl_cert_hostcheck(const char *match_pattern, const char *hostname) 
  return 0;

}



#endif /* SSLEAY or AXTLS */
 
#endif /* SSLEAY or AXTLS or QSOSSL */

lib/qssl.c

+32 −12
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -37,6 +37,7 @@ 
#include "sslgen.h"

#include "connect.h" /* for the connect timeout */

#include "select.h"

#include "x509asn1.h"

#include "curl_memory.h"

/* The last #include file should be: */

#include "memdebug.h"
@@ -169,10 +170,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex) 
  SSLHandle * h = connssl->handle;

  long timeout_ms;



  h->exitPgm = NULL;



  if(!data->set.ssl.verifyhost)

    h->exitPgm = Curl_qsossl_trap_cert;

  h->exitPgm = data->set.ssl.verifypeer? NULL: Curl_qsossl_trap_cert;



  /* figure out how long time we should wait at maximum */

  timeout_ms = Curl_timeleft(data, NULL, TRUE);
@@ -208,6 +206,8 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex) 
    break;

  }



  h->peerCert = NULL;

  h->peerCertLen = 0;

  rc = SSL_Handshake(h, SSL_HANDSHAKE_AS_CLIENT);



  switch (rc) {
@@ -238,6 +238,23 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex) 
    return CURLE_SSL_CONNECT_ERROR;

  }



  /* Verify host. */

  rc = Curl_verifyhost(conn, h->peerCert, h->peerCert + h->peerCertLen);

  if(rc != CURLE_OK)

    return rc;



  /* Gather certificate info. */

  if(data->set.ssl.certinfo) {

    if(Curl_ssl_init_certinfo(data, 1))

      return CURLE_OUT_OF_MEMORY;

    if(h->peerCert) {

      rc = Curl_extract_certinfo(conn, 0, h->peerCert,

                                 h->peerCert + h->peerCertLen);

      if(rc != CURLE_OK)

        return rc;

    }

  }



  return CURLE_OK;

}
@@ -257,19 +274,22 @@ CURLcode Curl_qsossl_connect(struct connectdata * conn, int sockindex) 
  if(rc == CURLE_OK) {

    rc = Curl_qsossl_create(conn, sockindex);



    if(rc == CURLE_OK)

    if(rc == CURLE_OK) {

      rc = Curl_qsossl_handshake(conn, sockindex);

    else {

      if(rc != CURLE_OK)

        SSL_Destroy(connssl->handle);

      connssl->handle = NULL;

      connssl->use = FALSE;

      connssl->state = ssl_connection_none;

    }

  }



  if(rc == CURLE_OK) {

    connssl->state = ssl_connection_complete;

    conn->recv[sockindex] = qsossl_recv;

    conn->send[sockindex] = qsossl_send;

    connssl->state = ssl_connection_complete;

  }

  else {

    connssl->handle = NULL;

    connssl->use = FALSE;

    connssl->state = ssl_connection_none;

  }



  return rc;

lib/url.c

+2 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,8 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
     */

    data->set.ssl.fsslctxp = va_arg(param, void *);

    break;

#endif

#if defined(USE_SSLEAY) || defined(USE_QSOSSL)

  case CURLOPT_CERTINFO:

    data->set.ssl.certinfo = (0 != va_arg(param, long))?TRUE:FALSE;

    break;

lib/x509asn1.c

0 → 100644
+1151 −0

File added.

Preview size limit exceeded, changes collapsed.