diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 208f24a..bf159ae 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -151,7 +151,6 @@
         psa_status_t status = PSA_ERROR_GENERIC_ERROR;
         int ret = MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
         psa_key_attributes_t key_attributes;
-        unsigned char own_pubkey[MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH];
         size_t own_pubkey_len;
         mbedtls_ssl_handshake_params *handshake = ssl->handshake;
         size_t ecdh_bits = 0;
@@ -186,7 +185,7 @@
 
         /* Export the public part of the ECDH private key from PSA. */
         status = psa_export_public_key( handshake->ecdh_psa_privkey,
-                                        own_pubkey, sizeof( own_pubkey ),
+                                        buf, (size_t)( end - buf ),
                                         &own_pubkey_len );
         if( status != PSA_SUCCESS )
         {
@@ -204,8 +203,6 @@
 
         *out_len = own_pubkey_len;
 
-        memcpy( buf, &own_pubkey, own_pubkey_len );
-
     return( 0 );
 }
 #endif /* MBEDTLS_ECDH_C */
@@ -381,7 +378,7 @@
         return( MBEDTLS_ERR_SSL_DECODE_ERROR );
 
     /* Store peer's ECDH public key. */
-    memcpy(handshake->ecdh_psa_peerkey, p, peerkey_len);
+    memcpy( handshake->ecdh_psa_peerkey, p, peerkey_len );
     handshake->ecdh_psa_peerkey_len = peerkey_len;
 
     return( 0 );