[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat libnbcompat-20080212:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ee15a3f375b
branches:  trunk
changeset: 538542:5ee15a3f375b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 12 13:43:23 2008 +0000

description:
libnbcompat-20080212:
Add digest length defines for md5, rmd160 and sha1. Use
__BEGIN_DECLS/__END_DECLS. Drop _KERNEL conditionals.

diffstat:

 pkgtools/libnbcompat/Makefile                |  4 ++--
 pkgtools/libnbcompat/files/nbcompat/md5.h    |  7 ++++---
 pkgtools/libnbcompat/files/nbcompat/rmd160.h |  7 ++++---
 pkgtools/libnbcompat/files/nbcompat/sha1.h   |  9 ++++++---
 4 files changed, 16 insertions(+), 11 deletions(-)

diffs (114 lines):

diff -r 92e5e1eda521 -r 5ee15a3f375b pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile     Tue Feb 12 12:20:44 2008 +0000
+++ b/pkgtools/libnbcompat/Makefile     Tue Feb 12 13:43:23 2008 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.55 2007/07/31 13:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2008/02/12 13:43:23 joerg Exp $
 #
 # NOTE: If you update this package, it is *mandatory* that you update
 #      pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #      list of tested and supported platforms.
 #
 
-DISTNAME=              libnbcompat-20070731
+DISTNAME=              libnbcompat-20080212
 CATEGORIES=            pkgtools devel
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 92e5e1eda521 -r 5ee15a3f375b pkgtools/libnbcompat/files/nbcompat/md5.h
--- a/pkgtools/libnbcompat/files/nbcompat/md5.h Tue Feb 12 12:20:44 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/md5.h Tue Feb 12 13:43:23 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md5.h,v 1.2 2004/08/16 17:24:57 jlam Exp $     */
+/*     $NetBSD: md5.h,v 1.3 2008/02/12 13:43:24 joerg Exp $    */
 
 /*
  * This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -32,6 +32,9 @@
 #ifndef _NBCOMPAT_SYS_MD5_H_
 #define _NBCOMPAT_SYS_MD5_H_
 
+#define MD5_DIGEST_LENGTH              16
+#define MD5_DIGEST_STRING_LENGTH       33
+
 /* MD5 context. */
 typedef struct MD5Context {
        u_int32_t state[4];     /* state (ABCD) */
@@ -43,11 +46,9 @@
 void   MD5Init __P((MD5_CTX *));
 void   MD5Update __P((MD5_CTX *, const unsigned char *, unsigned int));
 void   MD5Final __P((unsigned char[16], MD5_CTX *));
-#ifndef _KERNEL
 char   *MD5End __P((MD5_CTX *, char *));
 char   *MD5File __P((const char *, char *));
 char   *MD5Data __P((const unsigned char *, unsigned int, char *));
-#endif /* _KERNEL */
 __END_DECLS
 
 #endif /* !_NBCOMPAT_SYS_MD5_H_ */
diff -r 92e5e1eda521 -r 5ee15a3f375b pkgtools/libnbcompat/files/nbcompat/rmd160.h
--- a/pkgtools/libnbcompat/files/nbcompat/rmd160.h      Tue Feb 12 12:20:44 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/rmd160.h      Tue Feb 12 13:43:23 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rmd160.h,v 1.3 2007/07/31 13:17:34 joerg Exp $ */
+/*     $NetBSD: rmd160.h,v 1.4 2008/02/12 13:43:24 joerg Exp $ */
 
 /********************************************************************\
  *
@@ -24,6 +24,9 @@
 #ifndef _NBCOMPAT_RMD160_H_
 #define _NBCOMPAT_RMD160_H_
 
+#define RMD160_DIGEST_LENGTH           20
+#define RMD160_DIGEST_STRING_LENGTH    41
+
 typedef struct {
        u_int32_t       state[5];       /* state (ABCDE) */
        u_int32_t       length[2];      /* number of bits */
@@ -36,11 +39,9 @@
 void   RMD160Transform(u_int32_t[5], const u_int32_t[16]);
 void   RMD160Update(RMD160_CTX *, const unsigned char *, u_int32_t);
 void   RMD160Final(unsigned char[20], RMD160_CTX *);
-#ifndef        _KERNEL
 char   *RMD160End(RMD160_CTX *, char *);
 char   *RMD160File(char *, char *);
 char   *RMD160Data(const unsigned char *, size_t, char *);
-#endif /* _KERNEL */
 __END_DECLS
 
 #endif  /* !_NBCOMPAT_RMD160_H_ */
diff -r 92e5e1eda521 -r 5ee15a3f375b pkgtools/libnbcompat/files/nbcompat/sha1.h
--- a/pkgtools/libnbcompat/files/nbcompat/sha1.h        Tue Feb 12 12:20:44 2008 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/sha1.h        Tue Feb 12 13:43:23 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sha1.h,v 1.3 2007/07/31 13:17:34 joerg Exp $   */
+/*     $NetBSD: sha1.h,v 1.4 2008/02/12 13:43:24 joerg Exp $   */
 
 /*
  * SHA-1 in C
@@ -9,20 +9,23 @@
 #ifndef _NBCOMPAT_SYS_SHA1_H_
 #define        _NBCOMPAT_SYS_SHA1_H_
 
+#define SHA1_DIGEST_LENGTH             20
+#define SHA1_DIGEST_STRING_LENGTH      41
+
 typedef struct {
        u_int32_t state[5];
        u_int32_t count[2];  
        unsigned char buffer[64];
 } SHA1_CTX;
   
+__BEGIN_DECLS
 void   SHA1Transform __P((u_int32_t state[5], const unsigned char buffer[64]));
 void   SHA1Init __P((SHA1_CTX *context));
 void   SHA1Update __P((SHA1_CTX *context, const unsigned char *data, unsigned int len));
 void   SHA1Final __P((unsigned char digest[20], SHA1_CTX *context));
-#ifndef _KERNEL
 char   *SHA1End __P((SHA1_CTX *, char *));
 char   *SHA1File __P((char *, char *));
 char   *SHA1Data __P((const unsigned char *, size_t, char *));
-#endif /* _KERNEL */
+__END_DECLS
 
 #endif /* _NBCOMPAT_SYS_SHA1_H_ */