Sun Sep 6 21:25:19 2015 UTC ()
Fix up a few more symbol renames, now -Wimplicit-function-declaration clean.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/security/netpgpverify/files/digest.c
diff -r1.3 -r1.4 pkgsrc/security/netpgpverify/files/sha2.h
cvs diff -r1.2 -r1.3 pkgsrc/security/netpgpverify/files/digest.c (expand / switch to unified diff)

--- pkgsrc/security/netpgpverify/files/digest.c 2015/09/01 19:38:42 1.2
+++ pkgsrc/security/netpgpverify/files/digest.c 2015/09/06 21:25:19 1.3
@@ -118,27 +118,27 @@ digest_init(digest_t *hash, const uint32 @@ -118,27 +118,27 @@ digest_init(digest_t *hash, const uint32
118 hash->size = 16; 118 hash->size = 16;
119 hash->prefix = prefix_md5; 119 hash->prefix = prefix_md5;
120 hash->len = sizeof(prefix_md5); 120 hash->len = sizeof(prefix_md5);
121 hash->ctx = &hash->u.md5ctx; 121 hash->ctx = &hash->u.md5ctx;
122 return 1; 122 return 1;
123 case SHA1_HASH_ALG: 123 case SHA1_HASH_ALG:
124 netpgpv_SHA1Init(&hash->u.sha1ctx); 124 netpgpv_SHA1Init(&hash->u.sha1ctx);
125 hash->size = 20; 125 hash->size = 20;
126 hash->prefix = prefix_sha1; 126 hash->prefix = prefix_sha1;
127 hash->len = sizeof(prefix_sha1); 127 hash->len = sizeof(prefix_sha1);
128 hash->ctx = &hash->u.sha1ctx; 128 hash->ctx = &hash->u.sha1ctx;
129 return 1; 129 return 1;
130 case RIPEMD_HASH_ALG: 130 case RIPEMD_HASH_ALG:
131 RMD160Init(&hash->u.rmd160ctx); 131 netpgpv_RMD160Init(&hash->u.rmd160ctx);
132 hash->size = 20; 132 hash->size = 20;
133 hash->prefix = prefix_rmd160; 133 hash->prefix = prefix_rmd160;
134 hash->len = sizeof(prefix_rmd160); 134 hash->len = sizeof(prefix_rmd160);
135 hash->ctx = &hash->u.rmd160ctx; 135 hash->ctx = &hash->u.rmd160ctx;
136 return 1; 136 return 1;
137 case SHA256_HASH_ALG: 137 case SHA256_HASH_ALG:
138 netpgpv_SHA256_Init(&hash->u.sha256ctx); 138 netpgpv_SHA256_Init(&hash->u.sha256ctx);
139 hash->size = 32; 139 hash->size = 32;
140 hash->prefix = prefix_sha256; 140 hash->prefix = prefix_sha256;
141 hash->len = sizeof(prefix_sha256); 141 hash->len = sizeof(prefix_sha256);
142 hash->ctx = &hash->u.sha256ctx; 142 hash->ctx = &hash->u.sha256ctx;
143 return 1; 143 return 1;
144 case SHA512_HASH_ALG: 144 case SHA512_HASH_ALG:
@@ -202,27 +202,27 @@ int  @@ -202,27 +202,27 @@ int
202digest_update(digest_t *hash, const uint8_t *data, size_t length) 202digest_update(digest_t *hash, const uint8_t *data, size_t length)
203{ 203{
204 if (hash == NULL || data == NULL) { 204 if (hash == NULL || data == NULL) {
205 return 0; 205 return 0;
206 } 206 }
207 switch(hash->alg) { 207 switch(hash->alg) {
208 case MD5_HASH_ALG: 208 case MD5_HASH_ALG:
209 netpgpv_MD5Update(hash->ctx, data, (unsigned)length); 209 netpgpv_MD5Update(hash->ctx, data, (unsigned)length);
210 return 1; 210 return 1;
211 case SHA1_HASH_ALG: 211 case SHA1_HASH_ALG:
212 netpgpv_SHA1Update(hash->ctx, data, (unsigned)length); 212 netpgpv_SHA1Update(hash->ctx, data, (unsigned)length);
213 return 1; 213 return 1;
214 case RIPEMD_HASH_ALG: 214 case RIPEMD_HASH_ALG:
215 RMD160Update(hash->ctx, data, (unsigned)length); 215 netpgpv_RMD160Update(hash->ctx, data, (unsigned)length);
216 return 1; 216 return 1;
217 case SHA256_HASH_ALG: 217 case SHA256_HASH_ALG:
218 netpgpv_SHA256_Update(hash->ctx, data, length); 218 netpgpv_SHA256_Update(hash->ctx, data, length);
219 return 1; 219 return 1;
220 case SHA512_HASH_ALG: 220 case SHA512_HASH_ALG:
221 netpgpv_SHA512_Update(hash->ctx, data, length); 221 netpgpv_SHA512_Update(hash->ctx, data, length);
222 return 1; 222 return 1;
223 case TIGER_HASH_ALG: 223 case TIGER_HASH_ALG:
224 case TIGER2_HASH_ALG: 224 case TIGER2_HASH_ALG:
225 netpgpv_TIGER_Update(hash->ctx, data, length); 225 netpgpv_TIGER_Update(hash->ctx, data, length);
226 return 1; 226 return 1;
227 default: 227 default:
228 printf("hash_any: bad algorithm\n"); 228 printf("hash_any: bad algorithm\n");
@@ -234,27 +234,27 @@ unsigned  @@ -234,27 +234,27 @@ unsigned
234digest_final(uint8_t *out, digest_t *hash) 234digest_final(uint8_t *out, digest_t *hash)
235{ 235{
236 if (hash == NULL || out == NULL) { 236 if (hash == NULL || out == NULL) {
237 return 0; 237 return 0;
238 } 238 }
239 switch(hash->alg) { 239 switch(hash->alg) {
240 case MD5_HASH_ALG: 240 case MD5_HASH_ALG:
241 netpgpv_MD5Final(out, hash->ctx); 241 netpgpv_MD5Final(out, hash->ctx);
242 break; 242 break;
243 case SHA1_HASH_ALG: 243 case SHA1_HASH_ALG:
244 netpgpv_SHA1Final(out, hash->ctx); 244 netpgpv_SHA1Final(out, hash->ctx);
245 break; 245 break;
246 case RIPEMD_HASH_ALG: 246 case RIPEMD_HASH_ALG:
247 RMD160Final(out, hash->ctx); 247 netpgpv_RMD160Final(out, hash->ctx);
248 break; 248 break;
249 case SHA256_HASH_ALG: 249 case SHA256_HASH_ALG:
250 netpgpv_SHA256_Final(out, hash->ctx); 250 netpgpv_SHA256_Final(out, hash->ctx);
251 break; 251 break;
252 case SHA512_HASH_ALG: 252 case SHA512_HASH_ALG:
253 netpgpv_SHA512_Final(out, hash->ctx); 253 netpgpv_SHA512_Final(out, hash->ctx);
254 break; 254 break;
255 case TIGER_HASH_ALG: 255 case TIGER_HASH_ALG:
256 netpgpv_TIGER_Final(out, hash->ctx); 256 netpgpv_TIGER_Final(out, hash->ctx);
257 break; 257 break;
258 default: 258 default:
259 printf("hash_any: bad algorithm\n"); 259 printf("hash_any: bad algorithm\n");
260 return 0; 260 return 0;
cvs diff -r1.3 -r1.4 pkgsrc/security/netpgpverify/files/sha2.h (expand / switch to unified diff)

--- pkgsrc/security/netpgpverify/files/sha2.h 2015/09/01 19:38:42 1.3
+++ pkgsrc/security/netpgpverify/files/sha2.h 2015/09/06 21:25:19 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sha2.h,v 1.3 2015/09/01 19:38:42 agc Exp $ */ 1/* $NetBSD: sha2.h,v 1.4 2015/09/06 21:25:19 jperkin Exp $ */
2/* $KAME: sha2.h,v 1.4 2003/07/20 00:28:38 itojun Exp $ */ 2/* $KAME: sha2.h,v 1.4 2003/07/20 00:28:38 itojun Exp $ */
3 3
4/* 4/*
5 * sha2.h 5 * sha2.h
6 * 6 *
7 * Version 1.0.0beta1 7 * Version 1.0.0beta1
8 * 8 *
9 * Written by Aaron D. Gifford <me@aarongifford.com> 9 * Written by Aaron D. Gifford <me@aarongifford.com>
10 * 10 *
11 * Copyright 2000 Aaron D. Gifford. All rights reserved. 11 * Copyright 2000 Aaron D. Gifford. All rights reserved.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -106,23 +106,23 @@ char *netpgpv_SHA256_Data(const uint8_t  @@ -106,23 +106,23 @@ char *netpgpv_SHA256_Data(const uint8_t
106 106
107int netpgpv_SHA384_Init(NETPGPV_SHA384_CTX*); 107int netpgpv_SHA384_Init(NETPGPV_SHA384_CTX*);
108int netpgpv_SHA384_Update(NETPGPV_SHA384_CTX*, const uint8_t*, size_t); 108int netpgpv_SHA384_Update(NETPGPV_SHA384_CTX*, const uint8_t*, size_t);
109int netpgpv_SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], NETPGPV_SHA384_CTX*); 109int netpgpv_SHA384_Final(uint8_t[SHA384_DIGEST_LENGTH], NETPGPV_SHA384_CTX*);
110#ifndef _KERNEL 110#ifndef _KERNEL
111char *netpgpv_SHA384_End(NETPGPV_SHA384_CTX *, char[SHA384_DIGEST_STRING_LENGTH]); 111char *netpgpv_SHA384_End(NETPGPV_SHA384_CTX *, char[SHA384_DIGEST_STRING_LENGTH]);
112char *netpgpv_SHA384_FileChunk(const char *, char *, off_t, off_t); 112char *netpgpv_SHA384_FileChunk(const char *, char *, off_t, off_t);
113char *netpgpv_SHA384_File(const char *, char *); 113char *netpgpv_SHA384_File(const char *, char *);
114char *netpgpv_SHA384_Data(const uint8_t *, size_t, char[SHA384_DIGEST_STRING_LENGTH]); 114char *netpgpv_SHA384_Data(const uint8_t *, size_t, char[SHA384_DIGEST_STRING_LENGTH]);
115#endif /* !_KERNEL */ 115#endif /* !_KERNEL */
116 116
117int netpgpv_SHA512_Init(NETPGPV_SHA512_CTX*); 117int netpgpv_SHA512_Init(NETPGPV_SHA512_CTX*);
118int netpgpv_SHA512_Update(NETPGPV_SHA512_CTX*, const uint8_t*, size_t); 118int netpgpv_SHA512_Update(NETPGPV_SHA512_CTX*, const uint8_t*, size_t);
119int NETPGPV_SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], NETPGPV_SHA512_CTX*); 119int netpgpv_SHA512_Final(uint8_t[SHA512_DIGEST_LENGTH], NETPGPV_SHA512_CTX*);
120#ifndef _KERNEL 120#ifndef _KERNEL
121char *netpgpv_SHA512_End(NETPGPV_SHA512_CTX *, char[SHA512_DIGEST_STRING_LENGTH]); 121char *netpgpv_SHA512_End(NETPGPV_SHA512_CTX *, char[SHA512_DIGEST_STRING_LENGTH]);
122char *netpgpv_SHA512_FileChunk(const char *, char *, off_t, off_t); 122char *netpgpv_SHA512_FileChunk(const char *, char *, off_t, off_t);
123char *netpgpv_SHA512_File(const char *, char *); 123char *netpgpv_SHA512_File(const char *, char *);
124char *netpgpv_SHA512_Data(const uint8_t *, size_t, char[SHA512_DIGEST_STRING_LENGTH]); 124char *netpgpv_SHA512_Data(const uint8_t *, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
125#endif /* !_KERNEL */ 125#endif /* !_KERNEL */
126__END_DECLS 126__END_DECLS
127 127
128#endif /* __SHA2_H__ */ 128#endif /* __SHA2_H__ */