diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index b498a1a7c..359f8da7d 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5527,7 +5527,7 @@ psa_status_t psa_crypto_copy_input(const uint8_t *input, size_t input_len,
                                    uint8_t *input_copy, size_t input_copy_len)
 {
     if (input_len > input_copy_len) {
-        return PSA_ERROR_BUFFER_TOO_SMALL;
+        return PSA_ERROR_CORRUPTION_DETECTED;
     }
 
     memcpy(input_copy, input, input_len);
@@ -5539,7 +5539,7 @@ psa_status_t psa_crypto_copy_output(const uint8_t *output_copy, size_t output_co
                                     uint8_t *output, size_t output_len)
 {
     if (output_len < output_copy_len) {
-        return PSA_ERROR_BUFFER_TOO_SMALL;
+        return PSA_ERROR_CORRUPTION_DETECTED;
     }
     memcpy(output, output_copy, output_copy_len);
     return PSA_SUCCESS;
diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h
index 9e2048018..a05f6990c 100644
--- a/library/psa_crypto_core.h
+++ b/library/psa_crypto_core.h
@@ -523,8 +523,8 @@ psa_status_t psa_verify_hash_builtin(
  * \param[out] input_copy_len   Length of the local copy buffer.
  * \return                      #PSA_SUCCESS, if the buffer was successfully
  *                              copied.
- * \return                      #PSA_ERROR_BUFFER_TOO_SMALL, if the local copy
- *                              is too small to hold contents of the
+ * \return                      #PSA_ERROR_CORRUPTION_DETECTED, if the local
+ *                              copy is too small to hold contents of the
  *                              input buffer.
  */
 psa_status_t psa_crypto_copy_input(const uint8_t *input, size_t input_len,
@@ -538,7 +538,7 @@ psa_status_t psa_crypto_copy_input(const uint8_t *input, size_t input_len,
  * \param[out] output_len       Length of the user-supplied output buffer.
  * \return                      #PSA_SUCCESS, if the buffer was successfully
  *                              copied.
- * \return                      #PSA_ERROR_BUFFER_TOO_SMALL, if the
+ * \return                      #PSA_ERROR_CORRUPTION_DETECTED, if the
  *                              user-supplied output buffer is too small to
  *                              hold the contents of the local buffer.
  */
diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index eaeaaa57a..4c24e50af 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -4028,7 +4028,7 @@ PSA input buffer copy: copy buffer larger than required
 copy_input:10:20:PSA_SUCCESS
 
 PSA input buffer copy: copy buffer too small
-copy_input:20:10:PSA_ERROR_BUFFER_TOO_SMALL
+copy_input:20:10:PSA_ERROR_CORRUPTION_DETECTED
 
 PSA input buffer copy: zero-length source buffer
 copy_input:0:10:PSA_SUCCESS
@@ -4043,7 +4043,7 @@ PSA output buffer copy: output buffer larger than required
 copy_output:10:20:PSA_SUCCESS
 
 PSA output buffer copy: output buffer too small
-copy_output:20:10:PSA_ERROR_BUFFER_TOO_SMALL
+copy_output:20:10:PSA_ERROR_CORRUPTION_DETECTED
 
 PSA output buffer copy: zero-length source buffer
 copy_output:0:10:PSA_SUCCESS