diff --git a/ChangeLog b/ChangeLog
index 2a77b3d..bc21c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@
 Bugfix
    * Only iterate over actual certificates in ssl_write_certificate_request()
      (found by Matthew Page)
-   * Typo in platform.c (found by Daniel Phillips)
+   * Typos in platform.c and pkcs11.c (found by Daniel Phillips and Steffan
+     Karger)
 
 = PolarSSL 1.3.6 released on 2014-04-11
 
diff --git a/library/pkcs11.c b/library/pkcs11.c
index 054fdb7..3dacaf5 100644
--- a/library/pkcs11.c
+++ b/library/pkcs11.c
@@ -189,7 +189,7 @@
     }
 
     sig_len = ctx->len;
-    if ( hashlen > ctx_len || asn_len > sig_len ||
+    if ( hashlen > sig_len || asn_len > sig_len ||
          hashlen + asn_len > sig_len )
     {
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );