Openssl wrapper export interfaces

crypto/openssl_mbedtls_wrapper/include/openssl/ssl.h

@@ -124,7 +124,7 @@
  * Public Types
  ****************************************************************************/
 
 typedef unsigned int (*SSL_psk_client_cb_func)(SSL *ssl,
                                                const char *hint,
                                                char *identity,
                                                unsigned int max_identity_len,
@@ -203,26 +203,26 @@
  * Public Function Prototypes
  ****************************************************************************/
 
 X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
 
 int X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
                                     unsigned long flags);
 
 int X509_VERIFY_PARAM_clear_hostflags(X509_VERIFY_PARAM *param,
                                       unsigned long flags);
 
 int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x);
 
 int SSL_CTX_add_client_CA_ASN1(SSL_CTX *ssl, int len,
                                const unsigned char *d);
 
 int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
 
 int SSL_use_certificate(SSL *ssl, X509 *x);
 
 X509 *SSL_get_certificate(const SSL *ssl);
 
 int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
                                  const unsigned char *d);
 
 int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
@@ -251,7 +251,7 @@
 
 OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl);
 
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, ...);
+SSL_CTX *SSL_CTX_new(const SSL_METHOD *method);
 
 void SSL_CTX_free(SSL_CTX *ctx);
 
@@ -454,6 +454,10 @@
 
 int SSL_CTX_set_ex_data(SSL_CTX *s, int idx, void *arg);
 
+int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile);
+
+int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath);
+
 int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
                                   const char *CApath);
 

crypto/openssl_mbedtls_wrapper/mbedtls/ssl_lib.c

@@ -260,7 +260,7 @@ int SSL_get_error(const SSL *ssl, int ret_code)
   return ret;
 }
 
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *method, ...)
+SSL_CTX *SSL_CTX_new(const SSL_METHOD *method)
 {
   SSL_CTX *ctx;
   CERT *cert;

crypto/openssl_mbedtls_wrapper/mbedtls/ssl_pm.c

@@ -368,17 +368,21 @@ int ssl_pm_handshake(SSL *ssl)
     }
 
   /* OpenSSL return codes:
-   *   0 = did not complete, but may be retried
+   *   0 = The TLS/SSL handshake was not successful but was shut down
+   *       controlled and by the specifications of the TLS/SSL protocol.
    *   1 = successfully completed
-   *   <0 = death
+   *   <0 = The TLS/SSL handshake was not successful because a fatal error
+   *        occurred either at the protocol level or a connection failure
+   *        occurred.
    */
 
   if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE)
     {
-      ssl->err = ret;
+      ssl->err = (ret == MBEDTLS_ERR_SSL_WANT_READ) ? SSL_ERROR_WANT_READ :
+                                                      SSL_ERROR_WANT_WRITE;
       SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,
                 "mbedtls_ssl_handshake() return -0x%x", -ret);
-      return 0; /* OpenSSL: did not complete but may be retried */
+      return -1;
     }
 
   if (ret == 0)
@@ -397,7 +401,7 @@ int ssl_pm_handshake(SSL *ssl)
     {
       ssl->err = ret == MBEDTLS_ERR_SSL_WANT_READ;
 
-      return 0;
+      return -1;
     }
 
   SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL,