Adapt to mbed2/mbed3 difference

The signature of mbedtls_pk_parse_keyfile was changed in mbed3.
shirok · Nov 14, 2023 · 73967fa · 73967fa
1 parent f436639
commit 73967fa
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/ext/tls/tls-mbed.c b/ext/tls/tls-mbed.c
@@ -365,12 +365,27 @@ static ScmObj mbed_load_certificate(ScmTLS *tls,
     return SCM_OBJ(tls);
 }
 
+#if MBEDTLS_VERSION_MAJOR >= 3
+static int rng_get(void *prng, unsigned char *output, size_t output_len)
+{
+    mbedtls_ctr_drbg_context *rng = prng;
+    return mbedtls_ctr_drbg_random(rng, output, output_len);
+}
+#endif /*MBEDTLS_VERSION_MAJOR >= 3*/
+
 static ScmObj mbed_load_private_key(ScmTLS *tls,
                                     const char *filename,
                                     const char *password)
 {
     ScmMbedTLS *t = (ScmMbedTLS*)tls;
+#if MBEDTLS_VERSION_MAJOR < 3
     int r = mbedtls_pk_parse_keyfile(&t->pk, filename, password);
+#else  /*MBEDTLS_VERSION_MAJOR >= 3*/
+    mbedtls_ctr_drbg_context rng;
+    mbedtls_ctr_drbg_init(&rng);
+    int r = mbedtls_pk_parse_keyfile(&t->pk, filename, password,
+                                     rng_get, &rng);
+#endif /*MBEDTLS_VERSION_MAJOR >= 3*/
     if (r != 0) {
         const int bufsiz = 4096;
         char buf[bufsiz];