include:update header file for root CA support

Signed-off-by: Ajay Bhargav <[email protected]>

Author: ajaybhargav

include/net/sockets.h

@@ -6,6 +6,8 @@
 #ifndef INCLUDE_NET_SOCKETS_H_
 #define INCLUDE_NET_SOCKETS_H_
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -42,25 +44,6 @@ enum sock_events_e {
 	SOCK_EV_GPRS_FAILED,  /**< GPRS bearer failed. */
 };
 
-/**
- * SSL version
- */
-enum ssl_ver_e {
-	SSL_VER_DEFAULT,              /**< Default SSL version (TLS 1.2) */
-	TLS_VER_1V2 = SSL_VER_DEFAULT,/**< TLS v1.2 */
-	TLS_VER_1V1,                  /**< TLS v1.1 */
-	TLS_VER_1V0,                  /**< TLS v1.0 */
-	SSL_VER_3V0,                  /**< SSL v3 */
-};
-
-/**
- * SSL certificate input type
- */
-enum ssl_type_e {
-	SSL_TYPE_BUFFER,/**< certificate provided as a buffer */
-	SSL_TYPE_FILE   /**< certificate provided as a filename */
-};
-
 /**
  * Socket callback structure
  */
@@ -110,20 +93,20 @@ struct sockopt_t {
 struct ssl_sockopt_t {
 	char server_ip[100];	/**< IP/Domain name of server */
 	int port;				/**< SSL server port */
-	int (*status_callback)(int sockid, int status);	/**< SSL socket status callback */
 	void *arg;				/**< user data to associate with socket */
+	uint32_t timeout;		/**< SSL handshake timeout in seconds, 0 for default timeout */
 };
 
 /**
  * SSL client certificates
  */
 struct ssl_certs_t {
-	int cert_type;			/**< Input type see @ref ssl_type_e */
-	const void *cert;		/**< filename/buffer containing certificate (Only PEM format supported) */
-	int cert_len;			/**< Length of certificate in case buffer is provided */
-	int pkey_type;			/**< Input type see @ref ssl_type_e */
-	const void *privatekey;	/**< filename/buffer containing private key (Only PEM format supported) */
-	int privatekey_len;		/**< Length of private key in case buffer is provided */
+	const char *rootca;		/**< buffer containing Root CA */
+	int rootca_len;			/**< Length of Root CA buffer (with null) */
+	const char *cert;		/**< buffer containing certificate */
+	int cert_len;			/**< Length of certificate buffer (with null) */
+	const char *privatekey;	/**< buffer containing private key */
+	int privatekey_len;		/**< Length of private key buffer (with null) */
 };
 
 /* Normal Socket */
@@ -241,11 +224,10 @@ int socket_free(int id);
 /* SSL Sockets */
 /**
  * Request an SSL socket.
- * @param ssl_version	[in] SSL version @ref ssl_ver_e
  * @param certs			[in] SSL client certificate and private key. NULL if not used
  * @return				On success SSL socket ID is returned, On error negative value is returned
  */
-int ssl_socket_request(int ssl_version, struct ssl_certs_t *certs);
+int ssl_socket_request(struct ssl_certs_t *certs);
 
 /**
  * Configure SSL socket

include/proto/httpc.h

@@ -57,6 +57,18 @@ struct http_filemeta_t {
 	const char *mime;     /**< File mime type when mime_type is set to @ref HTTP_MIME_TYPE_CUSTOM, e.g. "text/csv", NULL otherwise */
 };
 
+/**
+ * SSL client certificates
+ */
+struct http_certs_t {
+	const char *rootca;		/**< buffer containing Root CA */
+	int rootca_len;			/**< Length of Root CA buffer (with null) */
+	const char *cert;		/**< buffer containing certificate */
+	int cert_len;			/**< Length of certificate buffer (with null) */
+	const char *privatekey;	/**< buffer containing private key */
+	int privatekey_len;		/**< Length of private key buffer (with null) */
+};
+
 /**
  * HTTP download finished callback
  * @param dl_size		Download size
@@ -71,7 +83,7 @@ typedef void (*http_download_cb)(unsigned int dl_size, unsigned int reserved, in
 struct httparg_t {
 	const char *url;					/**< Client URL */
 	const char *headers;				/**< Custom headers, can be NULL. if used then header must end with CRLF (\\r\\n) */
-	struct ssl_certs_t *certs;			/**< SSL Client certificate */
+	struct http_certs_t *certs;			/**< SSL Client certificate */
 	const void *submit_data;			/**< Data to send as request body */
 	uint16_t submit_len;				/**< Length of data to send */
 	uint8_t mime;						/**< MIME type @ref http_mimetype_e */
@@ -88,7 +100,7 @@ struct httpupload_t {
 	const char *url;					/**< Client URL */
 	const char *headers;				/**< Custom headers, can be NULL. if used then header must end with CRLF (\\r\\n) */
 	const struct http_filemeta_t *meta;	/**< Upload file information @ref http_filemeta_t */
-	const struct ssl_certs_t *certs;	/**< SSL Client certificates */
+	const struct http_certs_t *certs;	/**< SSL Client certificates */
 	int recv_headers;					/**< if TRUE, HTTP response headers are also stored in response buffer */
 	char *resp_buffer;					/**< Pointer to response buffer */
 	uint16_t buflen;					/**< Length of response buffer */
@@ -103,7 +115,7 @@ struct httpdownload_t {
 	const char *url;					/**< Client URL */
 	const char *headers;				/**< Custom headers, can be NULL. if used then header must end with CRLF (\\r\\n) */
 	const char *filepath;				/**< Complete file path on storage media (255 max) */
-	const struct ssl_certs_t *certs;	/**< SSL Client certificates */
+	const struct http_certs_t *certs;	/**< SSL Client certificates */
 	http_download_cb callback;			/**< Callback function called after download is finished see @ref http_download_cb */
 	uint16_t timeout;					/**< Timeout in seconds for Read/Write in HTTP and READ in HTTPS, 0 for default 45 sec */
 };