Module Name: src
Committed By: agc
Date: Sun Aug 15 16:36:24 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: misc.c packet-parse.c
packet-show.c reader.c signature.c validate.c writer.c
Log Message:
get rid of more 64-bit lint
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
cvs rdiff -u -r1.40 -r1.41 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c
cvs rdiff -u -r1.41 -r1.42 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
cvs rdiff -u -r1.38 -r1.39 \
src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/netpgp/dist/src/lib/writer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/misc.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.35 src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.36
--- src/crypto/external/bsd/netpgp/dist/src/lib/misc.c:1.35 Sun Aug 15 07:52:27 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/misc.c Sun Aug 15 16:36:24 2010
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: misc.c,v 1.35 2010/08/15 07:52:27 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.36 2010/08/15 16:36:24 agc Exp $");
#endif
#include <sys/types.h>
@@ -1026,7 +1026,7 @@
}
/* read into contents of mem */
for (mem->length = 0 ;
- (cc = read(fileno(fp), &mem->buf[mem->length],
+ (cc = (int)read(fileno(fp), &mem->buf[mem->length],
(size_t)(mem->allocated - mem->length))) > 0 ;
mem->length += (size_t)cc) {
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.40 src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.41
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c:1.40 Sun Aug 15 16:10:56 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-parse.c Sun Aug 15 16:36:24 2010
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-parse.c,v 1.40 2010/08/15 16:10:56 agc Exp $");
+__RCSID("$NetBSD: packet-parse.c,v 1.41 2010/08/15 16:36:24 agc Exp $");
#endif
#ifdef HAVE_OPENSSL_CAST_H
@@ -2436,7 +2436,7 @@
(const uint8_t *) "", 1);
}
}
- passlen = strlen(passphrase);
+ passlen = (unsigned)strlen(passphrase);
for (n = 0; n * hashsize < keysize; ++n) {
unsigned i;
@@ -2799,7 +2799,7 @@
decrypt = __ops_get_decrypt(stream);
if (decrypt) {
__ops_region_t encregion;
- unsigned b = decrypt->blocksize;
+ unsigned b = (unsigned)decrypt->blocksize;
uint8_t buf[OPS_MAX_BLOCK_SIZE + 2] = "";
__ops_reader_push_decrypt(stream, decrypt, region);
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.16 src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.17
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c:1.16 Tue May 25 01:05:11 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-show.c Sun Aug 15 16:36:24 2010
@@ -60,7 +60,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: packet-show.c,v 1.16 2010/05/25 01:05:11 agc Exp $");
+__RCSID("$NetBSD: packet-show.c,v 1.17 2010/08/15 16:36:24 agc Exp $");
#endif
#include <stdlib.h>
@@ -465,7 +465,7 @@
* be replaced in the output by 2 chars of hex, so the length
* will be correct
*/
- unsigned len = strlen(fmt_unknown) + 1;
+ unsigned len = (unsigned)(strlen(fmt_unknown) + 1);
char *newstr;
if ((newstr = calloc(1, len)) == NULL) {
Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.41 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.42
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.41 Sun Aug 15 07:52:27 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Sun Aug 15 16:36:24 2010
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: reader.c,v 1.41 2010/08/15 07:52:27 agc Exp $");
+__RCSID("$NetBSD: reader.c,v 1.42 2010/08/15 16:36:24 agc Exp $");
#endif
#include <sys/types.h>
@@ -1806,7 +1806,7 @@
__OPS_USED(errors);
if (reader->offset + length > reader->length)
- n = reader->length - reader->offset;
+ n = (unsigned)(reader->length - reader->offset);
else
n = (unsigned)length;
Index: src/crypto/external/bsd/netpgp/dist/src/lib/signature.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.31 src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.32
--- src/crypto/external/bsd/netpgp/dist/src/lib/signature.c:1.31 Sun Aug 15 16:10:56 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/signature.c Sun Aug 15 16:36:24 2010
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: signature.c,v 1.31 2010/08/15 16:10:56 agc Exp $");
+__RCSID("$NetBSD: signature.c,v 1.32 2010/08/15 16:36:24 agc Exp $");
#endif
#include <sys/types.h>
@@ -840,7 +840,7 @@
OPS_PTAG_SS_CREATION_TIME : OPS_PTAG_SS_EXPIRATION_TIME;
/* just do 32-bit timestamps for just now - it's in the protocol */
return __ops_write_ss_header(sig->output, 5, tag) &&
- __ops_write_scalar(sig->output, (uint32_t)when, sizeof(uint32_t));
+ __ops_write_scalar(sig->output, (uint32_t)when, (unsigned)sizeof(uint32_t));
}
/**
Index: src/crypto/external/bsd/netpgp/dist/src/lib/validate.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.38 src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.39
--- src/crypto/external/bsd/netpgp/dist/src/lib/validate.c:1.38 Sun Aug 15 16:10:56 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/validate.c Sun Aug 15 16:36:24 2010
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: validate.c,v 1.38 2010/08/15 16:10:56 agc Exp $");
+__RCSID("$NetBSD: validate.c,v 1.39 2010/08/15 16:36:24 agc Exp $");
#endif
#include <sys/types.h>
@@ -884,7 +884,7 @@
len = (unsigned)__ops_mem_len(validation.mem);
cp = __ops_mem_data(validation.mem);
for (i = 0 ; i < (int)len ; i += cc) {
- cc = write(outfd, &cp[i], (unsigned)(len - i));
+ cc = (int)write(outfd, &cp[i], (unsigned)(len - i));
if (cc < 0) {
(void) fprintf(io->errs,
"netpgp: short write\n");
Index: src/crypto/external/bsd/netpgp/dist/src/lib/writer.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/writer.c:1.27 src/crypto/external/bsd/netpgp/dist/src/lib/writer.c:1.28
--- src/crypto/external/bsd/netpgp/dist/src/lib/writer.c:1.27 Sun Aug 15 16:10:56 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/writer.c Sun Aug 15 16:36:24 2010
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: writer.c,v 1.27 2010/08/15 16:10:56 agc Exp $");
+__RCSID("$NetBSD: writer.c,v 1.28 2010/08/15 16:36:24 agc Exp $");
#endif
#include <sys/types.h>
@@ -1550,7 +1550,7 @@
__ops_write(output, data, (unsigned)(sz_pd - 6));
data += (sz_pd - 6);
- sz_towrite -= sz_pd;
+ sz_towrite -= (unsigned)sz_pd;
return stream_write_litdata(output, data, (unsigned)sz_towrite);
}
@@ -1583,7 +1583,7 @@
se_ip->hash.add(&se_ip->hash, data, (unsigned)pdlen);
data += pdlen;
- len -= pdlen;
+ len -= (unsigned)pdlen;
}
return 1;
}
