From 3b221a88cee30efcac5029be3b2de6fc55ef37cf Mon Sep 17 00:00:00 2001
From: "t@thintz.com" <t@thintz.com>
Date: Wed, 31 Aug 2011 07:59:18 -0700
Subject: [PATCH] removed dependency on srfi-4-utils as it was gpl and not
 compatible with bsd

---
 hmac.meta         | 2 +-
 hmac.release-info | 3 ++-
 hmac.scm          | 7 +++----
 hmac.setup        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hmac.meta b/hmac.meta
index 3023cde..8816304 100644
--- a/hmac.meta
+++ b/hmac.meta
@@ -7,7 +7,7 @@
 
 (category crypt)
 
-(needs message-digest srfi-4-utils)
+(needs message-digest)
 
 (test-depends test sha1 string-utils)
 
diff --git a/hmac.release-info b/hmac.release-info
index 69ef8ba..68c7ff0 100644
--- a/hmac.release-info
+++ b/hmac.release-info
@@ -5,4 +5,5 @@
 (release "2")
 (release "3")
 (release "4")
-(release "5")
\ No newline at end of file
+(release "5")
+(release "6")
\ No newline at end of file
diff --git a/hmac.scm b/hmac.scm
index 643cbb4..0d12826 100644
--- a/hmac.scm
+++ b/hmac.scm
@@ -6,16 +6,15 @@
   (hmac)
 
 (import scheme chicken srfi-4 srfi-13)
-(use srfi-4-utils message-digest-port)
+(use message-digest-port)
 
 ; taken from example at http://wiki.call-cc.org/drupal-xml-rpc
 (define (hmac key digest-primitive #!optional (block-size 64))
   (when (> (string-length key) block-size)
     (set! key (call-with-output-digest digest-primitive (cut display key <>) 'string)))
   (set! key (string-pad-right key block-size (integer->char 0)))
-  (set! key (blob->u8vector (string->blob key)))
-  (let ((ipad (blob->string (u8vector->blob (u8vector-map (lambda (v) (bitwise-xor v #x36)) key))))
-        (opad (blob->string (u8vector->blob (u8vector-map (lambda (v) (bitwise-xor v #x5c)) key)))))
+  (let ((ipad (string-map (lambda (c) (integer->char (bitwise-xor (char->integer c) #x36))) key))
+	(opad (string-map (lambda (c) (integer->char (bitwise-xor (char->integer c) #x5c))) key)))
     (lambda (message)
       (call-with-output-digest digest-primitive (cut display (string-append opad (call-with-output-digest digest-primitive (cut display (string-append ipad message) <>) 'string)) <>) 'string))))
 
diff --git a/hmac.setup b/hmac.setup
index 1c9be2f..ce7d791 100644
--- a/hmac.setup
+++ b/hmac.setup
@@ -11,5 +11,5 @@
   ; Files to install for your extension:
   '("hmac.o" "hmac.so" "hmac.import.so")
   ; Assoc list with properties for your extension:
-  '((version 5)
+  '((version 6)
     (static "hmac.o"))) ;; for static linking
\ No newline at end of file