[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  688c244685981085cf0290a228771391cf22ff18 (commit)
      from  e0f9bf1de72e2717a5e8c2126259959e2d650777 (commit)


- Log -----------------------------------------------------------------
commit 688c244685981085cf0290a228771391cf22ff18
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat May 30 23:05:31 2015 +0100

    fix warning
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/pkcs8.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index f8a340e..e94a232 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -115,7 +115,7 @@ int pkcs8_main(int argc, char **argv)
     OPTION_CHOICE o;
     int nocrypt = 0, ret = 1, iter = PKCS12_DEFAULT_ITER, p8_broken = PKCS8_OK;
     int informat = FORMAT_PEM, outformat = FORMAT_PEM, topk8 = 0, pbe_nid = -1;
-    uint64_t scrypt_N = 0, scrypt_r = 0, scrypt_p = 0;
+    unsigned long scrypt_N = 0, scrypt_r = 0, scrypt_p = 0;
 
     prog = opt_init(argc, argv, pkcs8_options);
     while ((o = opt_next()) != OPT_EOF) {