CVS commit: pkgsrc/security/ykclient

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Dec 18 21:50:08 UTC 2016

Modified Files:
        pkgsrc/security/ykclient: Makefile distinfo
Added Files:
        pkgsrc/security/ykclient/patches: patch-configure patch-hmac.c
            patch-sha.h patch-ykclient.c

Log Message:
Rename hmac to ykhmac. Bump library version.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/ykclient/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/ykclient/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/ykclient/patches/patch-configure \
    pkgsrc/security/ykclient/patches/patch-hmac.c \
    pkgsrc/security/ykclient/patches/patch-sha.h \
    pkgsrc/security/ykclient/patches/patch-ykclient.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/ykclient/Makefile
diff -u pkgsrc/security/ykclient/Makefile:1.15 pkgsrc/security/ykclient/Makefile:1.16
--- pkgsrc/security/ykclient/Makefile:1.15      Fri Oct  7 18:25:34 2016
+++ pkgsrc/security/ykclient/Makefile   Sun Dec 18 21:50:08 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/10/07 18:25:34 adam Exp $
+# $NetBSD: Makefile,v 1.16 2016/12/18 21:50:08 joerg Exp $
 
 DISTNAME=      ykclient-2.13
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  http://yubico.github.io/yubico-c-client/releases/
 

Index: pkgsrc/security/ykclient/distinfo
diff -u pkgsrc/security/ykclient/distinfo:1.10 pkgsrc/security/ykclient/distinfo:1.11
--- pkgsrc/security/ykclient/distinfo:1.10      Wed Nov  4 01:18:12 2015
+++ pkgsrc/security/ykclient/distinfo   Sun Dec 18 21:50:08 2016
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:18:12 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/12/18 21:50:08 joerg Exp $
 
 SHA1 (ykclient-2.13.tar.gz) = ddd6888794c023a2624d484e0b86bb92bed382ea
 RMD160 (ykclient-2.13.tar.gz) = 0d32152e386a9d508f01e3b51c254f9c2febd80b
 SHA512 (ykclient-2.13.tar.gz) = 1d684539c051ff6da7d3b99660ea6aa205bc9241233961bcbdd0f81414d69456c2137f51b46a7e06ac871106a3c704bd3d543b6d4aff2c5ae4dff76277e1083b
 Size (ykclient-2.13.tar.gz) = 385672 bytes
+SHA1 (patch-hmac.c) = 8e360aaebb27f81a73d031bcf2e8f88bcb648100
+SHA1 (patch-sha.h) = 767ce1f7133475d8b68d3e44b4590fb460a1b53a
+SHA1 (patch-ykclient.c) = 22e73b7f22fcae17dbb253876d6d943f9a7ddbc2

Added files:

Index: pkgsrc/security/ykclient/patches/patch-configure
diff -u /dev/null pkgsrc/security/ykclient/patches/patch-configure:1.1
--- /dev/null   Sun Dec 18 21:50:08 2016
+++ pkgsrc/security/ykclient/patches/patch-configure    Sun Dec 18 21:50:08 2016
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure,v 1.1 2016/12/18 21:50:08 joerg Exp $
+
+--- configure.orig     2016-12-18 21:48:59.031799007 +0000
++++ configure
+@@ -2185,11 +2185,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
+ # Interfaces changed/added/removed:   CURRENT++       REVISION=0
+ # Interfaces added:                             AGE++
+ # Interfaces removed:                           AGE=0
+-LT_CURRENT=8
++LT_CURRENT=9
+ 
+ LT_REVISION=3
+ 
+-LT_AGE=5
++LT_AGE=6
+ 
+ 
+ am__api_version='1.14'
Index: pkgsrc/security/ykclient/patches/patch-hmac.c
diff -u /dev/null pkgsrc/security/ykclient/patches/patch-hmac.c:1.1
--- /dev/null   Sun Dec 18 21:50:08 2016
+++ pkgsrc/security/ykclient/patches/patch-hmac.c       Sun Dec 18 21:50:08 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-hmac.c,v 1.1 2016/12/18 21:50:08 joerg Exp $
+
+--- hmac.c.orig        2016-12-18 16:48:04.404560212 +0000
++++ hmac.c
+@@ -36,8 +36,8 @@
+  *
+  */
+ int
+-hmac (SHAversion whichSha, const unsigned char *text, int text_len,
+-      const unsigned char *key, int key_len, uint8_t digest[USHAMaxHashSize])
++ykhmac (SHAversion whichSha, const unsigned char *text, int text_len,
++        const unsigned char *key, int key_len, uint8_t digest[USHAMaxHashSize])
+ {
+   HMACContext ctx;
+   return hmacReset (&ctx, whichSha, key, key_len) ||
Index: pkgsrc/security/ykclient/patches/patch-sha.h
diff -u /dev/null pkgsrc/security/ykclient/patches/patch-sha.h:1.1
--- /dev/null   Sun Dec 18 21:50:08 2016
+++ pkgsrc/security/ykclient/patches/patch-sha.h        Sun Dec 18 21:50:08 2016
@@ -0,0 +1,23 @@
+$NetBSD: patch-sha.h,v 1.1 2016/12/18 21:50:08 joerg Exp $
+
+--- sha.h.orig 2016-12-18 16:47:35.780062621 +0000
++++ sha.h
+@@ -246,12 +246,12 @@ extern int USHAHashSizeBits (enum SHAver
+  * for all SHAs.
+  * This interface allows a fixed-length text input to be used.
+  */
+-extern int hmac (SHAversion whichSha, /* which SHA algorithm to use */
+-               const unsigned char *text,     /* pointer to data stream */
+-               int text_len,  /* length of data stream */
+-               const unsigned char *key,      /* pointer to authentication key */
+-               int key_len,   /* length of authentication key */
+-               uint8_t digest[USHAMaxHashSize]);      /* caller digest to fill in */
++extern int ykhmac (SHAversion whichSha,       /* which SHA algorithm to use */
++                 const unsigned char *text,   /* pointer to data stream */
++                 int text_len,        /* length of data stream */
++                 const unsigned char *key,    /* pointer to authentication key */
++                 int key_len, /* length of authentication key */
++                 uint8_t digest[USHAMaxHashSize]);    /* caller digest to fill in */
+ 
+ /*
+  * HMAC Keyed-Hashing for Message Authentication, RFC2104,
Index: pkgsrc/security/ykclient/patches/patch-ykclient.c
diff -u /dev/null pkgsrc/security/ykclient/patches/patch-ykclient.c:1.1
--- /dev/null   Sun Dec 18 21:50:08 2016
+++ pkgsrc/security/ykclient/patches/patch-ykclient.c   Sun Dec 18 21:50:08 2016
@@ -0,0 +1,17 @@
+$NetBSD: patch-ykclient.c,v 1.1 2016/12/18 21:50:08 joerg Exp $
+
+--- ykclient.c.orig    2016-12-18 16:52:46.162549370 +0000
++++ ykclient.c
+@@ -1014,9 +1014,9 @@ ykclient_expand_urls (ykclient_t * ykc, 
+             text++;
+ 
+             /* HMAC data. */
+-            res = hmac (SHA1, (unsigned char *) text, strlen (text),
+-                        (const unsigned char *) ykc->key, ykc->keylen,
+-                        digest);
++            res = ykhmac (SHA1, (unsigned char *) text, strlen (text),
++                          (const unsigned char *) ykc->key, ykc->keylen,
++                          digest);
+             if (res != shaSuccess)
+               {
+                 out = YKCLIENT_HMAC_ERROR;