commit 12b60bc702aeea156df4ffc0049e246fbc587bc0
author Simon Butcher <simon.butcher@arm.com> Wed Jan 23 09:53:29 2019 +0100
committer Simon Butcher <simon.butcher@arm.com> Wed Jan 23 09:53:29 2019 +0100
tree 6734e54217512eb5600d9ea6c98b9d4005cee49f
parent c5b6c2f877d586bf99bc3c5d71a57d57fc84cd2e
parent 4a47112834d74d90d9e44ae52f2cf67ef5a98fb7

Merge remote-tracking branch 'public/pr/2341' into mbedtls-2.7

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0f9c81b..d23ecd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
    * Run the AD too long test only if MBEDTLS_CCM_ALT is not defined.
      Raised as a comment in #1996.
    * Fix returning the value 1 when mbedtls_ecdsa_genkey failed.
+   * Remove a duplicate #include in a sample program. Fixed by Masashi Honma #2326.
 
 = mbed TLS 2.7.9 branch released 2018-12-21
 

programs/pkey/rsa_sign_pss.c

diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index b0b0f7e..e1c8ef6 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -54,7 +54,6 @@
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/md.h"
 #include "mbedtls/rsa.h"
-#include "mbedtls/md.h"
 #include "mbedtls/x509.h"
 
 #include <stdio.h>