diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 8b2d50d2f0..44bfcb0062 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -1539,13 +1539,6 @@ void mbedtls_ssl_tls13_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl,
                                                unsigned char const *msg,
                                                size_t msg_len );
 
-/* Get handshake transcript */
-int mbedtls_ssl_tls13_get_handshake_transcript( mbedtls_ssl_context *ssl,
-                                                const mbedtls_md_type_t md,
-                                                unsigned char *dst,
-                                                size_t dst_len,
-                                                size_t *olen );
-
 #if defined(MBEDTLS_ECDH_C)
 /*
  * TLS 1.3 version of mbedtls_ecdh_read_public in ecdh.h
@@ -1577,4 +1570,11 @@ int mbedtls_ssl_tls13_write_sig_alg_ext( mbedtls_ssl_context *ssl,
 
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
 
+/* Get handshake transcript */
+int mbedtls_ssl_get_handshake_transcript( mbedtls_ssl_context *ssl,
+                                          const mbedtls_md_type_t md,
+                                          unsigned char *dst,
+                                          size_t dst_len,
+                                          size_t *olen );
+
 #endif /* ssl_misc.h */
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index dc7b1e85c6..ae5a5b8026 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6978,13 +6978,11 @@ exit:
 
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
-#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
-
 #if defined(MBEDTLS_SHA384_C)
-static int ssl_tls13_get_handshake_transcript_sha384( mbedtls_ssl_context *ssl,
-                                                      unsigned char *dst,
-                                                      size_t dst_len,
-                                                      size_t *olen )
+static int ssl_get_handshake_transcript_sha384( mbedtls_ssl_context *ssl,
+                                                unsigned char *dst,
+                                                size_t dst_len,
+                                                size_t *olen )
 {
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     psa_status_t status;
@@ -7039,10 +7037,10 @@ exit:
 #endif /* MBEDTLS_SHA384_C */
 
 #if defined(MBEDTLS_SHA256_C)
-static int ssl_tls13_get_handshake_transcript_sha256( mbedtls_ssl_context *ssl,
-                                                      unsigned char *dst,
-                                                      size_t dst_len,
-                                                      size_t *olen )
+static int ssl_get_handshake_transcript_sha256( mbedtls_ssl_context *ssl,
+                                                unsigned char *dst,
+                                                size_t dst_len,
+                                                size_t *olen )
 {
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     psa_status_t status;
@@ -7096,29 +7094,27 @@ exit:
 }
 #endif /* MBEDTLS_SHA256_C */
 
-int mbedtls_ssl_tls13_get_handshake_transcript( mbedtls_ssl_context *ssl,
-                                                const mbedtls_md_type_t md,
-                                                unsigned char *dst,
-                                                size_t dst_len,
-                                                size_t *olen )
+int mbedtls_ssl_get_handshake_transcript( mbedtls_ssl_context *ssl,
+                                          const mbedtls_md_type_t md,
+                                          unsigned char *dst,
+                                          size_t dst_len,
+                                          size_t *olen )
 {
 #if defined(MBEDTLS_SHA384_C)
     if( md == MBEDTLS_MD_SHA384 )
     {
-        return( ssl_tls13_get_handshake_transcript_sha384( ssl, dst, dst_len, olen ) );
+        return( ssl_get_handshake_transcript_sha384( ssl, dst, dst_len, olen ) );
     }
     else
 #endif /* MBEDTLS_SHA512_C */
 #if defined(MBEDTLS_SHA256_C)
     if( md == MBEDTLS_MD_SHA256 )
     {
-        return( ssl_tls13_get_handshake_transcript_sha256( ssl, dst, dst_len, olen ) );
+        return( ssl_get_handshake_transcript_sha256( ssl, dst, dst_len, olen ) );
     }
     else
 #endif /* MBEDTLS_SHA256_C */
     return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
 }
 
-#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
-
 #endif /* MBEDTLS_SSL_TLS_C */
diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c
index 5435a25a4c..7e65268196 100644
--- a/library/ssl_tls13_keys.c
+++ b/library/ssl_tls13_keys.c
@@ -875,14 +875,14 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
     md_info = mbedtls_md_info_from_type( md_type );
     md_size = mbedtls_md_get_size( md_info );
 
-    ret = mbedtls_ssl_tls13_get_handshake_transcript( ssl, md_type,
+    ret = mbedtls_ssl_get_handshake_transcript( ssl, md_type,
                                                       transcript,
                                                       sizeof( transcript ),
                                                       &transcript_len );
     if( ret != 0 )
     {
         MBEDTLS_SSL_DEBUG_RET( 1,
-                               "mbedtls_ssl_tls13_get_handshake_transcript",
+                               "mbedtls_ssl_get_handshake_transcript",
                                ret );
         return( ret );
     }