From 47f3b505ee8697e6f2723cf3dc47adcc80c68cdb Mon Sep 17 00:00:00 2001
From: Jon Shallow <supjps-libcoap@jpshallow.com>
Date: Sun, 30 Oct 2022 19:15:43 +0000
Subject: [PATCH] TLS: Updates for later TLS library versions

---
 src/coap_mbedtls.c | 4 ++++
 src/coap_openssl.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/coap_mbedtls.c b/src/coap_mbedtls.c
index db8f204e..40fcdfdc 100644
--- a/src/coap_mbedtls.c
+++ b/src/coap_mbedtls.c
@@ -1305,7 +1305,11 @@ static int do_mbedtls_handshake(coap_session_t *c_session,
     goto reset;
   case MBEDTLS_ERR_SSL_INVALID_MAC:
     goto fail;
+#ifdef MBEDTLS_2_X_COMPAT
   case MBEDTLS_ERR_SSL_UNKNOWN_CIPHER:
+#else /* ! MBEDTLS_2_X_COMPAT */
+  case MBEDTLS_ERR_SSL_DECODE_ERROR:
+#endif /* ! MBEDTLS_2_X_COMPAT */
     goto fail;
   case MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE:
     alert = MBEDTLS_SSL_ALERT_MSG_NO_CERT;
diff --git a/src/coap_openssl.c b/src/coap_openssl.c
index 00225c20..cf867d79 100644
--- a/src/coap_openssl.c
+++ b/src/coap_openssl.c
@@ -1922,6 +1922,7 @@ tls_verify_call_back(int preverify_ok, X509_STORE_CTX *ctx) {
       break;
     case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
     case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
+    case X509_V_ERR_AKID_SKID_MISMATCH:
       if (!setup_data->verify_peer_cert)
         preverify_ok = 1;
       break;