Rename hmac to ykhmac. Bump library version.

4 files changed, 73 insertions, 0 deletions

diff --git a/security/ykclient/patches/patch-configure b/security/ykclient/patches/patch-configure
new file mode 100644
index 00000000000..5b358c0df71
--- /dev/null
+++ b/security/ykclient/patches/patch-configure
@@ -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'
diff --git a/security/ykclient/patches/patch-hmac.c b/security/ykclient/patches/patch-hmac.c
new file mode 100644
index 00000000000..ee429dd748d
--- /dev/null
+++ b/security/ykclient/patches/patch-hmac.c
@@ -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) ||
diff --git a/security/ykclient/patches/patch-sha.h b/security/ykclient/patches/patch-sha.h
new file mode 100644
index 00000000000..4ef1c7d15cd
--- /dev/null
+++ b/security/ykclient/patches/patch-sha.h
@@ -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,
diff --git a/security/ykclient/patches/patch-ykclient.c b/security/ykclient/patches/patch-ykclient.c
new file mode 100644
index 00000000000..156bb52b68a
--- /dev/null
+++ b/security/ykclient/patches/patch-ykclient.c
@@ -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;