commit de659cdc2e4164d468d7035b74f7fd5dbeccf0cf
author Adam Langley <agl@google.com> Tue Oct 27 16:18:51 2015 -0700
committer Adam Langley <agl@google.com> Tue Oct 27 16:18:51 2015 -0700
tree b0b41b85659906169a26a13340d7f9a67e8bc4e9
parent 13f1dd497fdb2b107f80fab092785d67f70b0083

Fix PKCS#8 on 32-bit systems.

The previous commit fixed a signed/unsigned warning but, on 32-bit
systems, long is only 32 bits, so the fix was incorrect there.

Change-Id: I6afe340164de0e176c7f710fcdd095b2a4cddee4

crypto/pkcs8/p5_pbev2.c

diff --git a/crypto/pkcs8/p5_pbev2.c b/crypto/pkcs8/p5_pbev2.c
index 5ccee40..fec0d86 100644
--- a/crypto/pkcs8/p5_pbev2.c
+++ b/crypto/pkcs8/p5_pbev2.c
@@ -356,7 +356,8 @@
     goto err;
   }
   long iterations = ASN1_INTEGER_get(pbkdf2param->iter);
-  if (iterations <= 0 || iterations > (long) UINT_MAX) {
+  if (iterations <= 0 ||
+      (sizeof(long) > sizeof(unsigned) && iterations > (long)UINT_MAX)) {
     OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_ITERATION_COUNT);
     goto err;
   }