Fix: make static ECDH selectable with the br_ssl_client_set_single_ec() helper function.

diff --git a/inc/bearssl.h b/inc/bearssl.h
index 4f4797c..310edb2 100644 (file)
--- a/inc/bearssl.h
+++ b/inc/bearssl.h
@@ -137,6 +137,10 @@
 #include "bearssl_x509.h"
 #include "bearssl_pem.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \brief Type for a configuration option.
  *
  * A "configuration option" is a value that is selected when the BearSSL
@@ -167,4 +171,13 @@ typedef struct {
  */
 const br_config_option *br_get_config(void);
 
+/* ======================================================================= */
+
+/** \brief Version feature: support for time callback. */
+#define BR_FEATURE_X509_TIME_CALLBACK   1
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/src/rsa/rsa_i62_keygen.c b/src/rsa/rsa_i62_keygen.c
index 8f55c37..992fe97 100644 (file)
--- a/src/rsa/rsa_i62_keygen.c
+++ b/src/rsa/rsa_i62_keygen.c
@@ -40,7 +40,7 @@ br_rsa_i62_keygen(const br_prng_class **rng,
 
 /* see bearssl_rsa.h */
 br_rsa_keygen
-br_rsa_i62_keygen_get()
+br_rsa_i62_keygen_get(void)
 {
        return &br_rsa_i62_keygen;
 }
@@ -49,7 +49,7 @@ br_rsa_i62_keygen_get()
 
 /* see bearssl_rsa.h */
 br_rsa_keygen
-br_rsa_i62_keygen_get()
+br_rsa_i62_keygen_get(void)
 {
        return 0;
 }

diff --git a/src/ssl/ssl_ccert_single_ec.c b/src/ssl/ssl_ccert_single_ec.c
index 93ebcde..2e1e54f 100644 (file)
--- a/src/ssl/ssl_ccert_single_ec.c
+++ b/src/ssl/ssl_ccert_single_ec.c
@@ -69,6 +69,7 @@ cc_choose(const br_ssl_client_certificate_class **pctx,
                        choices->hash_id = -1;
                        choices->chain = zc->chain;
                        choices->chain_len = zc->chain_len;
+                       return;
                }
        }