diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 32ff2eb1c102f57b4225df77fbaebe65d42b2a3b..fb8ecc54dd0fc206d6b0d28272c45023a0947873 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -59,6 +59,7 @@
 /meta-hash-test
 /pbkdf2-test
 /pkcs1-test
+/pkcs1-sec-decrypt-test
 /poly1305-test
 /pss-mgf1-test
 /pss-test
diff --git a/testsuite/.test-rules.make b/testsuite/.test-rules.make
index 2023e06c9a5023b09879f58e231e395315da72a4..e2f0b465f9ece86987d3ea588d5717a726868acd 100644
--- a/testsuite/.test-rules.make
+++ b/testsuite/.test-rules.make
@@ -187,6 +187,9 @@ random-prime-test$(EXEEXT): random-prime-test.$(OBJEXT)
 pkcs1-test$(EXEEXT): pkcs1-test.$(OBJEXT)
 	$(LINK) pkcs1-test.$(OBJEXT) $(TEST_OBJS) -o pkcs1-test$(EXEEXT)
 
+pkcs1-sec-decrypt-test$(EXEEXT): pkcs1-sec-decrypt-test.$(OBJEXT)
+	$(LINK) pkcs1-sec-decrypt-test.$(OBJEXT) $(TEST_OBJS) -o pkcs1-sec-decrypt-test$(EXEEXT)
+
 pss-test$(EXEEXT): pss-test.$(OBJEXT)
 	$(LINK) pss-test.$(OBJEXT) $(TEST_OBJS) -o pss-test$(EXEEXT)
 
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 9a7f6a237bac0524c2d377d80965235216998175..aa594a2411c1fc97dbed15974e102f9453c8365f 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -36,7 +36,8 @@ TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
 TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \
 		     rsa2sexp-test.c sexp2rsa-test.c \
 		     bignum-test.c random-prime-test.c \
-		     pkcs1-test.c pss-test.c rsa-sign-tr-test.c \
+		     pkcs1-test.c pkcs1-sec-decrypt-test.c \
+		     pss-test.c rsa-sign-tr-test.c \
 		     pss-mgf1-test.c rsa-pss-sign-tr-test.c \
 		     rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \
 		     dsa-test.c dsa-keygen-test.c \
diff --git a/testsuite/pkcs1-sec-decrypt-test.c b/testsuite/pkcs1-sec-decrypt-test.c
new file mode 100644
index 0000000000000000000000000000000000000000..780c96d2182056902db374504887f46e4d5d78f3
--- /dev/null
+++ b/testsuite/pkcs1-sec-decrypt-test.c
@@ -0,0 +1,76 @@
+#include "testutils.h"
+
+#include "rsa.h"
+#include "rsa-internal.h"
+
+#if HAVE_VALGRIND_MEMCHECK_H
+# include <valgrind/memcheck.h>
+static int
+pkcs1_decrypt_for_test(size_t msg_len, uint8_t *msg,
+                       size_t pad_len, uint8_t *pad)
+{
+  int ret;
+
+  VALGRIND_MAKE_MEM_UNDEFINED (msg, msg_len);
+  VALGRIND_MAKE_MEM_UNDEFINED (pad, pad_len);
+
+  ret = _pkcs1_sec_decrypt (msg_len, msg, pad_len, pad);
+
+  VALGRIND_MAKE_MEM_DEFINED (msg, msg_len);
+  VALGRIND_MAKE_MEM_DEFINED (pad, pad_len);
+
+  return ret;
+}
+#else
+#define pkcs1_decrypt_for_test _pkcs1_sec_decrypt
+#endif
+
+void
+test_main(void)
+{
+  uint8_t pad[128];
+  uint8_t buffer[] =
+    "\x00\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"
+    "\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"
+    "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"
+    "\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"
+    "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50"
+    "\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"
+    "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"
+    "\x00\x53\x49\x47\x4e\x45\x44\x20\x4d\x45\x53\x53\x41\x47\x45\x2e";
+  uint8_t message[15];
+
+  memcpy(pad, buffer, 128);
+
+  memset (message, 'A', 15);
+  ASSERT (pkcs1_decrypt_for_test(15, message, 128, pad) == 1);
+  ASSERT (memcmp (message, "SIGNED MESSAGE.", 15) == 0);
+
+  /* break format byte 1 */
+  memcpy(pad, buffer, 128);
+  pad[0] = 1;
+  memset (message, 'B', 15);
+  ASSERT (pkcs1_decrypt_for_test(15, message, 128, pad) == 0);
+  ASSERT (memcmp (message, "BBBBBBBBBBBBBBB", 15) == 0);
+
+  /* break format byte 2 */
+  memcpy(pad, buffer, 128);
+  pad[1] = 1;
+  memset (message, 'C', 15);
+  ASSERT (pkcs1_decrypt_for_test(15, message, 128, pad) == 0);
+  ASSERT (memcmp (message, "CCCCCCCCCCCCCCC", 15) == 0);
+
+  /* break padding */
+  memcpy(pad, buffer, 128);
+  pad[24] = 0;
+  memset (message, 'D', 15);
+  ASSERT (pkcs1_decrypt_for_test(15, message, 128, pad) == 0);
+  ASSERT (memcmp (message, "DDDDDDDDDDDDDDD", 15) == 0);
+
+  /* break terminator */
+  memcpy(pad, buffer, 128);
+  pad[112] = 1;
+  memset (message, 'E', 15);
+  ASSERT (pkcs1_decrypt_for_test(15, message, 128, pad) == 0);
+  ASSERT (memcmp (message, "EEEEEEEEEEEEEEE", 15) == 0);
+}