diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 5180a16db0..2f4884cab7 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -2034,7 +2034,7 @@ static inline int mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg(
             *md_alg = MBEDTLS_MD_SHA512;
             *pk_type = MBEDTLS_PK_RSA;
             break;
-#endif /* MBEDTLS_SHA384_C */
+#endif /* MBEDTLS_SHA512_C */
 
 #endif /* MBEDTLS_PKCS1_V15 && MBEDTLS_RSA_C */
 
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 25004fd8a3..f7212214e2 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -1129,13 +1129,10 @@ static int ssl_tls13_write_certificate_verify_body( mbedtls_ssl_context *ssl,
         return( MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE );
     }
 
-    ret = mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg( algorithm,
-                                                                 &pk_type,
-                                                                 &md_alg );
-    if( ret != 0 )
+    if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg(
+                                        algorithm, &pk_type, &md_alg ) != 0 )
     {
         return( MBEDTLS_ERR_SSL_INTERNAL_ERROR  );
-
     }
 
     /* Check there is space for the algorithm identifier (2 bytes) and the