yubikey 1.0.0 → 1.0.2

data/ext/yubikey_ext/yubikey_ext.c

@@ -1,27 +1,6 @@
 #include "ruby.h"
 #include "yubikey.h"
 
-/*
- * call-seq:
- *   decode(modhex_string) -> string
- *
- * Decode a ModHex string into binary data
- */
-static VALUE
-modhex_decode(VALUE self, VALUE modhex_string) {
-  char* modhex_string_ptr = StringValuePtr(modhex_string);
-  size_t modhex_string_size = strlen(modhex_string_ptr);
-  size_t decoded_string_size = modhex_string_size/2;
-  char* decoded_string;
-  
-   if (modhex_string_size % 2 != 0)
-     rb_raise(rb_eArgError, "ModHex string length is not even");
-  
-  yubikey_modhex_decode(decoded_string, modhex_string_ptr, modhex_string_size);
-  
-  return rb_str_new(decoded_string, decoded_string_size);
-}
-
 /*
  * call-seq:
  *   decrypt(state, key) -> plaintext
@@ -67,10 +46,8 @@ void
 Init_yubikey_ext() {
   VALUE rb_mYubikey = rb_define_module("Yubikey");
   VALUE rb_mYubikeyAES = rb_define_module_under(rb_mYubikey, "AES");
-  VALUE rb_mYubikeyModHex = rb_define_module_under(rb_mYubikey, "ModHex");
   VALUE rb_mYubikeyCRC = rb_define_module_under(rb_mYubikey, "CRC");
-  
-  rb_define_module_function(rb_mYubikeyModHex, "decode", modhex_decode, 1);
+
   rb_define_module_function(rb_mYubikeyAES, "decrypt", aes_decrypt, 2);
   rb_define_module_function(rb_mYubikeyCRC, "valid?", crc_check, 1);
 }

data/lib/yubikey.rb

@@ -3,4 +3,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'yubikey_ext'
 require 'yubikey/hex'
+require 'yubikey/modhex'
 require 'yubikey/otp'

data/lib/yubikey/modhex.rb

@@ -0,0 +1,39 @@
+module Yubikey::ModHex
+  
+  TRANS = 'cbdefghijklnrtuv'.split(//)
+  
+  # Decode a ModHex string into binary data
+  def self.decode(modhex_string)
+    out = ''
+    flag = true  # to switch between first and last nibble
+    byte = 0
+    
+    raise ArgumentError, "ModHex string length is not even" unless modhex_string.length % 2 == 0
+    
+    modhex_string.each_byte do |b|
+      x = TRANS.index(b.chr)  # lookup occurrence in table
+      if flag
+        byte = x
+      else
+        byte = (byte << 4) | x
+        out <<= byte.chr 
+      end
+      flag = !flag
+    end
+    
+    out
+  end
+  
+  # Encode a binary string into ModHex
+  def self.encode(string)
+    out = ''
+    
+    string.each_byte do |b|
+      out <<= TRANS[(b >> 4) & 0xF]
+      out <<= TRANS[b & 0xF]
+    end
+    
+    out
+  end
+  
+end # Yubikey::ModHex

data/spec/yubikey_ext_spec.rb

@@ -4,22 +4,6 @@ $:.unshift File.dirname(__FILE__) + '/../ext/yubikey_ext'
 require 'yubikey_ext.so'
 
 describe 'yubikey_ext' do
-  it 'should decode modhex' do
-    Yubikey::ModHex.decode('hknhfjbrjnlnldnhcujvddbikngjrtgh').should == "i\266H\034\213\253\242\266\016\217\"\027\233X\315V"
-    Yubikey::ModHex.decode('urtubjtnuihvntcreeeecvbregfjibtn').should == "\354\336\030\333\347o\275\f33\017\0345Hq\333"
-    
-    Yubikey::ModHex.decode('dteffuje').should == "-4N\203"
-    
-    Yubikey::ModHex.decode('ifhgieif').should == 'test'
-    Yubikey::ModHex.decode('hhhvhvhdhbid').should == 'foobar'
-    
-    Yubikey::ModHex.decode('cc').should == "\000"
-  end
-  
-  it 'should raise if modhex string length uneven' do
-    lambda { Yubikey::ModHex.decode('ifh') }.should raise_error(ArgumentError)
-  end
-  
   it 'should decrypt aes' do
     key = '72992427a3b8ccd20697493b5532561f'.to_bin
     state = 'ddf43aec57366784e061a12f767e728a'.to_bin

data/spec/yubikey_modhex_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'Yubikey::Modhex' do
+  it 'should decode modhex' do
+    Yubikey::ModHex.decode('hknhfjbrjnlnldnhcujvddbikngjrtgh').should == "i\266H\034\213\253\242\266\016\217\"\027\233X\315V"
+    Yubikey::ModHex.decode('urtubjtnuihvntcreeeecvbregfjibtn').should == "\354\336\030\333\347o\275\f33\017\0345Hq\333"
+    
+    Yubikey::ModHex.decode('dteffuje').should == "-4N\203"
+    
+    Yubikey::ModHex.decode('ifhgieif').should == 'test'
+    Yubikey::ModHex.decode('hhhvhvhdhbid').should == 'foobar'
+    
+    Yubikey::ModHex.decode('cc').should == "\000"
+  end
+  
+  it 'should raise if modhex string length uneven' do
+    lambda { Yubikey::ModHex.decode('ifh') }.should raise_error(ArgumentError)
+  end
+  
+  it 'should encode modhex' do
+    Yubikey::ModHex.encode("i\266H\034\213\253\242\266\016\217\"\027\233X\315V").should == 'hknhfjbrjnlnldnhcujvddbikngjrtgh'
+    Yubikey::ModHex.encode("\354\336\030\333\347o\275\f33\017\0345Hq\333").should == 'urtubjtnuihvntcreeeecvbregfjibtn'
+    
+    Yubikey::ModHex.encode("-4N\203").should == 'dteffuje'
+    
+    Yubikey::ModHex.encode('test').should == 'ifhgieif'
+    Yubikey::ModHex.encode('foobar').should == 'hhhvhvhdhbid'
+    
+    Yubikey::ModHex.encode("\000").should == 'cc'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yubikey
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jonathan Rudenberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-02 00:00:00 -04:00
+date: 2009-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -20,32 +20,39 @@ executables: []
 extensions: 
 - ext/yubikey_ext/extconf.rb
 extra_rdoc_files: 
-- ext/yubikey_ext/yubikey_ext.c
-- README.rdoc
 - LICENSE
+- README.rdoc
+- ext/yubikey_ext/yubikey_ext.c
 files: 
+- examples/otp.rb
+- ext/yubikey_ext/extconf.rb
+- ext/yubikey_ext/ykaes.c
+- ext/yubikey_ext/ykcrc.c
+- ext/yubikey_ext/yubikey.h
+- ext/yubikey_ext/yubikey_ext.c
 - lib/yubikey.rb
 - lib/yubikey/hex.rb
+- lib/yubikey/modhex.rb
 - lib/yubikey/otp.rb
-- examples/otp.rb
 - spec/hex_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/yubikey_ext_spec.rb
+- spec/yubikey_modhex_spec.rb
 - spec/yubikey_otp_spec.rb
-- ext/yubikey_ext/ykaes.c
-- ext/yubikey_ext/ykcrc.c
-- ext/yubikey_ext/ykmodhex.c
-- ext/yubikey_ext/yubikey_ext.c
-- ext/yubikey_ext/yubikey.h
-- ext/yubikey_ext/extconf.rb
-- README.rdoc
 - LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/titanous/yubikey
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
+- --title
+- yubikey
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -63,9 +70,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yubikey
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library to decode, decrypt and parse Yubikey one-time passwords.
-test_files: []
-
+test_files: 
+- spec/hex_spec.rb
+- spec/spec_helper.rb
+- spec/yubikey_ext_spec.rb
+- spec/yubikey_modhex_spec.rb
+- spec/yubikey_otp_spec.rb
+- examples/otp.rb

data/ext/yubikey_ext/ykmodhex.c

@@ -1,76 +0,0 @@
-/* ykmodhex.c --- Implementation of modhex encoding/decoding
- *
- * Written by Simon Josefsson <simon@josefsson.org>.
- * Copyright (c) 2006, 2007, 2008, 2009 Yubico AB
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *
- *    * Redistributions in binary form must reproduce the above
- *      copyright notice, this list of conditions and the following
- *      disclaimer in the documentation and/or other materials provided
- *      with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "yubikey.h"
-
-#include <stdbool.h>
-
-static const char trans[] = YUBIKEY_MODHEX_MAP;
-
-void
-yubikey_modhex_encode (char *dst, const char *src, size_t srcSize)
-{
-  while (srcSize--)
-    {
-      *dst++ = trans[(*src >> 4) & 0xf];
-      *dst++ = trans[*src++ & 0xf];
-    }
-
-  *dst = '\0';
-}
-
-void
-yubikey_modhex_decode (char *dst, const char *src, size_t dstSize)
-{
-  char b;
-  bool flag = false;
-  char *p1;
-
-  for (; *src && dstSize > 0; src++)
-    {
-      if ((p1 = strchr (trans, *src)) == NULL)
-	b = 0;
-      else
-	b = (char) (p1 - trans);
-
-      if ((flag = !flag))
-	*dst = b;
-      else
-	{
-	  *dst = (*dst << 4) | b;
-	  dst++;
-	  dstSize--;
-	}
-    }
-  while (dstSize--)
-    *dst++ = 0;
-}