Change PK module preprocessor check on word size
There were preprocessor directives in pk.c and pk_wrap.c that cheked
whether the bit length of size_t was greater than that of unsigned int.
However, the check relied on the POLARSSL_HAVE_INT64 macro being
defined which is not directly related to size_t. This might result in
errors in some platforms. This change modifies the check to use the
macros SIZE_MAX and UINT_MAX instead making the code more robust.
diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index ceaaad1..9da59ec 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -31,7 +31,6 @@
/* Even if RSA not activated, for the sake of RSA-alt */
#include "polarssl/rsa.h"
-#include "polarssl/bignum.h"
#include <string.h>
@@ -52,6 +51,7 @@
#endif
#include <limits.h>
+#include <stdint.h>
/* Implementation that should never be optimized out by the compiler */
static void polarssl_zeroize( void *v, size_t n ) {
@@ -76,10 +76,10 @@
{
int ret;
-#if defined(POLARSSL_HAVE_INT64)
+#if SIZE_MAX > UINT_MAX
if( md_alg == POLARSSL_MD_NONE && UINT_MAX < hash_len )
return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
-#endif /* POLARSSL_HAVE_INT64 */
+#endif /* SIZE_MAX > UINT_MAX */
if( sig_len < ((rsa_context *) ctx)->len )
return( POLARSSL_ERR_RSA_VERIFY_FAILED );
@@ -100,10 +100,10 @@
unsigned char *sig, size_t *sig_len,
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
{
-#if defined(POLARSSL_HAVE_INT64)
+#if SIZE_MAX > UINT_MAX
if( md_alg == POLARSSL_MD_NONE && UINT_MAX < hash_len )
return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
-#endif /* POLARSSL_HAVE_INT64 */
+#endif /* SIZE_MAX > UINT_MAX */
*sig_len = ((rsa_context *) ctx)->len;
@@ -424,10 +424,10 @@
{
rsa_alt_context *rsa_alt = (rsa_alt_context *) ctx;
-#if defined(POLARSSL_HAVE_INT64)
+#if SIZE_MAX > UINT_MAX
if( UINT_MAX < hash_len )
return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
-#endif /* POLARSSL_HAVE_INT64 */
+#endif /* SIZE_MAX > UINT_MAX */
*sig_len = rsa_alt->key_len_func( rsa_alt->key );