]> err.no Git - yubikey-personalization/commitdiff
We don't need the common directory any more
authorRichard Levitte <levitte@lp.se>
Mon, 22 Sep 2008 20:27:37 +0000 (20:27 +0000)
committerRichard Levitte <levitte@lp.se>
Mon, 22 Sep 2008 20:27:37 +0000 (20:27 +0000)
common/aes128.c [deleted file]
common/aes128.h [deleted file]
common/ykutil.c [deleted file]
common/ykutil.h [deleted file]
common/yubikey.c [deleted file]
common/yubikey.h [deleted file]

diff --git a/common/aes128.c b/common/aes128.c
deleted file mode 100644 (file)
index 843bf94..0000000
+++ /dev/null
@@ -1,288 +0,0 @@
-/*************************************************************************\r
-**                                                                      **\r
-**      A E S 1 2 8  -  AES-128 encryption and decryption                              **\r
-**                                                                      **\r
-**      Copyright 2008 Yubico AB                                                                               **\r
-**                                                                      **\r
-**      Date           / Sig / Rev  / History                              **\r
-**      2008-06-05     / J E / 0.00 / Main                                                                     **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-#include "aes128.h"\r
-#include <string.h>\r
-\r
-#define        NUMBER_OF_ROUNDS        10\r
-\r
-static const unsigned char RC[] = \r
-       { 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 };\r
-\r
-static const unsigned char sbox[] = {\r
-  0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, \r
-  0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, \r
-  0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, \r
-  0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, \r
-  0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, \r
-  0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, \r
-  0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, \r
-  0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, \r
-  0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, \r
-  0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, \r
-  0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, \r
-  0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, \r
-  0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, \r
-  0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, \r
-  0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, \r
-  0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, \r
-  0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, \r
-  0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, \r
-  0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, \r
-  0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, \r
-  0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, \r
-  0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, \r
-  0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, \r
-  0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, \r
-  0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, \r
-  0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, \r
-  0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, \r
-  0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, \r
-  0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, \r
-  0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, \r
-  0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, \r
-  0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16\r
-};\r
-\r
-static const unsigned char inv_sbox[] = {\r
-  0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, \r
-  0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, \r
-  0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, \r
-  0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, \r
-  0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, \r
-  0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, \r
-  0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, \r
-  0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, \r
-  0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, \r
-  0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, \r
-  0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, \r
-  0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, \r
-  0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, \r
-  0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, \r
-  0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, \r
-  0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, \r
-  0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, \r
-  0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, \r
-  0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, \r
-  0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, \r
-  0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, \r
-  0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, \r
-  0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, \r
-  0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, \r
-  0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, \r
-  0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, \r
-  0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, \r
-  0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, \r
-  0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, \r
-  0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, \r
-  0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, \r
-  0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d\r
-};\r
-\r
-static unsigned char xtime(unsigned char b) { \r
-       return (b & 0x80) ? ((b << 1) ^ 0x1b) : (b << 1); \r
-}\r
-\r
-/*************************************************************************\r
-**  function aesEncrypt                                                                                                        **\r
-**  Encrypts a single AES-128 block                                                                            **\r
-**                                                                      **\r
-**     void aesEncrypt(unsigned char *state, const unsigned char *key)         **\r
-**                                                                      **\r
-**  Where:                                                              **\r
-**     "state" is state buffer, i.e. plaintext in, ciphertext out                      **\r
-**     "key" is pointer to AES key                                                                                     **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-void aesEncrypt(unsigned char *state, const unsigned char *key)\r
-{\r
-       unsigned char i, j, k, tmp, round_key[0x10];\r
-\r
-       memcpy(round_key, key, sizeof(round_key));\r
-\r
-       for (i = 0; i < 16; i++) state[i] ^= key[i];\r
-\r
-       for (i = 0; i < NUMBER_OF_ROUNDS; i++) {\r
-\r
-               // byte_sub_shift_row(state);\r
-\r
-               /* First row: 0 shift, 0 4 8 12 */\r
-               state[0] = sbox[state[0]];\r
-               state[4] = sbox[state[4]];\r
-               state[8] = sbox[state[8]];\r
-               state[12] = sbox[state[12]];\r
-\r
-               /* Second row: 1 shift, 1 5 9 13 */  \r
-               tmp = state[1];\r
-               state[1] = sbox[state[5]];\r
-               state[5] = sbox[state[9]];\r
-               state[9] = sbox[state[13]];\r
-               state[13] = sbox[tmp];\r
-\r
-               /* Third row: 2 shift, 2 6 10 14 */\r
-               tmp = state[2];\r
-               state[2] = sbox[state[10]];\r
-               state[10] = sbox[tmp];\r
-               tmp = state[6];\r
-               state[6] = sbox[state[14]];\r
-               state[14] = sbox[tmp];\r
-\r
-               /* Fourth row: 3 shift, 3 7 11 15 */\r
-               tmp = state[15];\r
-               state[15] = sbox[state[11]];\r
-               state[11] = sbox[state[7]];\r
-               state[7] = sbox[state[3]];\r
-               state[3] = sbox[tmp];\r
-\r
-               if (i != (NUMBER_OF_ROUNDS - 1)) {\r
-\r
-                       // mix_column(state);\r
-\r
-                       for (k = 0; k < 16; k += 4) {\r
-\r
-                               j = state[k] ^ state[k + 1];                            \r
-                               tmp = j ^ state[k + 2] ^ state[k + 3];\r
-    \r
-                               j = xtime(j);\r
-\r
-                               state[k] ^= (j ^ tmp);\r
-\r
-                               j = state[k + 1] ^ state[k + 2];\r
-                               j = xtime(j);\r
-\r
-                               state[k + 1] ^= (j ^ tmp);\r
-\r
-                               j = state[k + 2] ^ state[k + 3];\r
-                               j = xtime(j);\r
-\r
-                               state[k + 2] ^= (j ^ tmp);    \r
-                               state[k + 3] = state[k] ^ state[k + 1] ^ state[k + 2] ^ tmp;\r
-                       }\r
-               }\r
-\r
-               round_key[0] ^= RC[i];\r
-\r
-               round_key[0] ^= sbox[round_key[13]];\r
-               round_key[1] ^= sbox[round_key[14]];\r
-               round_key[2] ^= sbox[round_key[15]];\r
-               round_key[3] ^= sbox[round_key[12]];\r
-\r
-               for (k = 4; k < 16; k++) round_key[k] ^= round_key[k - 4];\r
-\r
-               // add_round_key(state, round_key);\r
-\r
-               for (j = 0; j < 16; j++) state[j] ^= round_key[j];\r
-       }\r
-}\r
-\r
-/*************************************************************************\r
-**  function aesDecrypt                                                                                                        **\r
-**  Decrypts a single AES-128 block                                                                            **\r
-**                                                                      **\r
-**     void aesDecrypt(unsigned char *state, const unsigned char *key)         **\r
-**                                                                      **\r
-**  Where:                                                              **\r
-**     "state" is state buffer, i.e. ciphertext in, plaintext out                      **\r
-**     "key" is pointer to AES key                                                                                     **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-void aesDecrypt(unsigned char *state, const unsigned char *key)\r
-{\r
-       unsigned char i, j, round_key[0x10];\r
-       unsigned char a02x, a13x;\r
-       unsigned char a02xx, a13xx;\r
-       unsigned char k1, k2;\r
-\r
-       memcpy(round_key, key, sizeof(round_key));\r
-       for (i = 0; i < NUMBER_OF_ROUNDS; i++) {\r
-               round_key[0] ^= RC[i];\r
-\r
-               round_key[0] ^= sbox[round_key[13]];\r
-               round_key[1] ^= sbox[round_key[14]];\r
-               round_key[2] ^= sbox[round_key[15]];\r
-               round_key[3] ^= sbox[round_key[12]];\r
-\r
-               for (j = 4; j < 16; j++) round_key[j] ^= round_key[j - 4];      \r
-       }\r
-       for (i = 0; i < 0x10; i++) state[i] ^= round_key[i];\r
-\r
-       for (i = 1; i <= NUMBER_OF_ROUNDS; i++) {\r
-               // inv_byte_sub_shift_row();\r
-               \r
-               /* First row: 0 shift, 0 4 8 12 */\r
-               state[0] = inv_sbox[state[0]];\r
-               state[4] = inv_sbox[state[4]];\r
-               state[8] = inv_sbox[state[8]];\r
-               state[12] = inv_sbox[state[12]];\r
-\r
-               /* Second row: -1 shift, 1 5 9 13 */  \r
-               j = state[13];\r
-               state[13] = inv_sbox[state[9]];\r
-               state[9] = inv_sbox[state[5]];\r
-               state[5] = inv_sbox[state[1]];\r
-               state[1] = inv_sbox[j];\r
-\r
-               /* Third row: -2 shift, 2 6 10 14 */\r
-               j = state[2];\r
-               state[2] = inv_sbox[state[10]];\r
-               state[10] = inv_sbox[j];\r
-               j = state[6];\r
-               state[6] = inv_sbox[state[14]];\r
-               state[14] = inv_sbox[j];\r
-\r
-               /* Fourth row: -3 shift, 3 7 11 15 */\r
-               j = state[3];\r
-               state[3] = inv_sbox[state[7]];\r
-               state[7] = inv_sbox[state[11]];\r
-               state[11] = inv_sbox[state[15]];\r
-               state[15] = inv_sbox[j];\r
-\r
-//             get_inv_round_key(i);\r
-\r
-               for (j = 15; j > 3; j--) round_key[j] ^= round_key[j - 4];\r
-\r
-               round_key[0] ^= (RC[NUMBER_OF_ROUNDS - i] ^ sbox[round_key[13]]);\r
-\r
-               round_key[1] ^= sbox[round_key[14]];\r
-               round_key[2] ^= sbox[round_key[15]];\r
-               round_key[3] ^= sbox[round_key[12]];\r
-\r
-               for (j = 0; j < 16; j++) state[j] ^= round_key[j];\r
-               if (i != NUMBER_OF_ROUNDS) {\r
-                       \r
-                       //inv_mix_column();\r
-\r
-                       for (j = 0; j < 16; j += 4) {\r
-                               k1 = state[j] ^ state[j + 2];\r
-                               a02x = xtime(k1);\r
-                               k2 = state[j + 1] ^ state[j + 3];\r
-                               a13x = xtime(k2);\r
-                               \r
-                               k1 ^= (k2 ^ xtime(state[j + 1] ^ state[j + 2]));\r
-                               k2 = k1;\r
-\r
-                               a02xx = xtime(a02x);\r
-                               a13xx = xtime(a13x);\r
-\r
-                               k1 ^= (xtime(a02xx ^ a13xx) ^ a02xx);\r
-                               k2 ^= (xtime(a02xx ^ a13xx) ^ a13xx);\r
-\r
-                               state[j] ^= (k1 ^ a02x);\r
-                               state[j + 1] ^= k2;\r
-                               state[j + 2] ^= (k1 ^ a13x);\r
-                               state[j + 3] ^= (k2 ^ a02x ^ a13x);\r
-                       }\r
-               }\r
-\r
-       }\r
-}\r
diff --git a/common/aes128.h b/common/aes128.h
deleted file mode 100644 (file)
index ad526cf..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*************************************************************************\r
-**                                                                      **\r
-**      A E S 1 2 8  -  AES-128 encryption and decryption                              **\r
-**                                                                      **\r
-**      Copyright 2008 Yubico AB                                                                               **\r
-**                                                                      **\r
-**      Date           / Sig / Rev  / History                              **\r
-**      2008-06-05     / J E / 0.00 / Main                                                                     **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-extern void aesEncrypt(unsigned char *state, const unsigned char *key);\r
-extern void aesDecrypt(unsigned char *state, const unsigned char *key);\r
diff --git a/common/ykutil.c b/common/ykutil.c
deleted file mode 100644 (file)
index efb39b2..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************\r
-**                                                                      **\r
-**      Y K U T I L  -  Yubikey utilities                              **\r
-**                                                                      **\r
-**      Copyright 2008 Yubico AB                                       **\r
-**                                                                      **\r
-**      Date           / Sig / Rev  / History                          **\r
-**      2008-06-05     / J E / 0.00 / Main                             **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-#include "ykutil.h"\r
-#include "yubikey.h"\r
-#include <string.h>\r
-#include <ctype.h>\r
-#include <aes128.h>\r
-\r
-/*************************************************************************\r
-**  function getCRC                                                    **\r
-**  Calculate ISO13239 checksum of buffer                              **\r
-**                                                                      **\r
-**     unsigned short getCRC(const unsigned char *buf, int bcnt)       **\r
-**                                                                      **\r
-**  Where:                                                              **\r
-**     "buf" is pointer to buffer                                      **\r
-**     "bcnt" is size of the buffer                                    **\r
-**                                                                     **\r
-**     Returns: ISO13239 checksum                                      **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-unsigned short getCRC(const unsigned char *buf, int bcnt)\r
-{\r
-       unsigned short crc = 0xffff;\r
-       int i;\r
-\r
-       while (bcnt--) {\r
-               crc ^= *buf++;\r
-               for (i = 0; i < 8; i++) crc = (crc & 1) ? ((crc >> 1) ^ 0x8408) : (crc >> 1);\r
-       }\r
-\r
-       return crc;\r
-}\r
-\r
-/*************************************************************************\r
-**  function modhexDecode                                              **\r
-**  Decodes modhex string into binary                                  **\r
-**                                                                      **\r
-**     int modhexDecode(unsigned char *dst, const unsigned char *src,  **\r
-**                                      int dstSize)                   **\r
-**                                                                      **\r
-**  Where:                                                              **\r
-**     "dst" is pointer to decoded binary data                         **\r
-**     "src" is pointer to modhex string                               **\r
-**     "dstSize" is size of the destination buffer                     **\r
-**                                                                     **\r
-**     Returns: Number of bytes decoded                                **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-int modhexDecode(unsigned char *dst, const unsigned char *src, int dstSize)\r
-{\r
-       static const char trans[] = MODHEX_MAP;\r
-       unsigned char b, flag = 0;\r
-       int bcnt;\r
-       char *p1;\r
-\r
-       for (bcnt = 0; *src && (bcnt < dstSize); src++) {\r
-               if (p1 = strchr(trans, tolower(*src)))\r
-                       b = (unsigned char) (p1 - trans);\r
-               else\r
-                       b = 0;\r
-\r
-               if (flag = !flag) \r
-                       *dst = b;\r
-               else {\r
-                       *dst = (*dst << 4) | b;\r
-                       dst++;\r
-                       bcnt++;\r
-               }\r
-       }\r
-\r
-       return bcnt;\r
-}\r
-\r
-/*************************************************************************\r
-**  function parseOTP                                                  **\r
-**  Parses OTP string and inserts result in TICKET structure           **\r
-**                                                                      **\r
-**     int parseOTP(TICKET *tkt, unsigned char *fixed,                 **\r
-**                              int *fixedSize, const char *str,       **\r
-**                              const char *key)                       **\r
-**                                                                      **\r
-**  Where:                                                              **\r
-**     "tkt" is pointer to receiving TICKET structure                  **\r
-**     "fixed" is pointer to receiving fixed part buffer               **\r
-**     "fixedSize" is pointer to receiving size of fixed part          **\r
-**     "str" is pointer to ascii OTP string                            **\r
-**     "key" is pointer to AES key                                     **\r
-**                                                                     **\r
-**     Returns: Nonzero if successful, zero otherwise                  **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-int parseOTP(TICKET *tkt, unsigned char *fixed, int *fixedSize, const char *str, const unsigned char *key)\r
-{\r
-       int i, j;\r
-       unsigned char bin[FIXED_SIZE + sizeof(TICKET)];\r
-\r
-       // Convert from modhex to binary. Must be at least sizeof(TICKET) bytes\r
-\r
-       if ((i = modhexDecode(bin, str, sizeof(bin))) < sizeof(TICKET)) return 0;\r
-\r
-       // The ticket is located in the last 16 bytes\r
-\r
-       memcpy(tkt, bin + i - sizeof(TICKET), sizeof(TICKET));\r
-\r
-       // Decrypt the stuff\r
-\r
-       aesDecrypt((unsigned char *) tkt, key);\r
-\r
-       // Is the checksum okay ?\r
-\r
-       j = getCRC((unsigned char *) tkt, sizeof(TICKET));\r
-       ENDIAN_SWAP(j);\r
-       if (j != CRC_OK_RESIDUE) return 0;\r
-\r
-       // Shape up little-endian fields (if applicable)\r
-\r
-       ENDIAN_SWAP(tkt->rnd);\r
-       ENDIAN_SWAP(tkt->tstpl);\r
-       ENDIAN_SWAP(tkt->useCtr);\r
-\r
-       // Insert fixed id (if present)\r
-\r
-       *fixedSize = i - sizeof(TICKET);\r
-       \r
-       if (*fixedSize) memcpy(fixed, bin, *fixedSize);\r
-\r
-       return 1;\r
-}\r
diff --git a/common/ykutil.h b/common/ykutil.h
deleted file mode 100644 (file)
index af75ce0..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*************************************************************************\r
-**                                                                      **\r
-**      Y K U T I L  -  Yubikey utilities                              **\r
-**                                                                      **\r
-**      Copyright 2008 Yubico AB                                       **\r
-**                                                                      **\r
-**      Date           / Sig / Rev  / History                          **\r
-**      2008-06-05     / J E / 0.00 / Main                             **\r
-**                                                                      **\r
-*************************************************************************/\r
-\r
-#include <ykdef.h>\r
-\r
-#define        CRC_OK_RESIDUE  0xf0b8\r
-\r
-extern unsigned short getCRC(const unsigned char *, int);\r
-extern int modhexDecode(unsigned char *, const unsigned char *, int);\r
-extern int parseOTP(TICKET *tkt, unsigned char *fixed, int *fixedSize, const char *str, const unsigned char *key);\r
-\r
diff --git a/common/yubikey.c b/common/yubikey.c
deleted file mode 100644 (file)
index 4dc5456..0000000
+++ /dev/null
@@ -1,293 +0,0 @@
-/*************************************************************************
-**                                                                      **
-**      Y U B I K E Y  -  Basic LibUSB programming API for the Yubikey **
-**                                                                      **
-**      Copyright 2008 Yubico AB                                       **
-**                                                                      **
-**      Date           / Sig / Rev  / History                          **
-**      2008-06-05     / J E / 0.00 / Main                             **
-**                                                                      **
-*************************************************************************/
-
-#include <usb.h>               // Rename to avoid clash with windows USBxxx headers
-#include "yubikey.h"
-#include <ykutil.h>
-
-#define        YUBICO_VID                              0x1050
-#define        YUBIKEY_PID                             0x0010
-
-#define HID_GET_REPORT                 0x01
-#define HID_SET_REPORT                 0x09
-
-#define        FEATURE_RPT_SIZE                8
-
-#define        REPORT_TYPE_FEATURE             0x03
-
-/*************************************************************************
-**  function hidSetReport                                              **
-**  Set HID report                                                     **
-**                                                                      **
-**  int hidSetReport(YUBIKEY *yk, int reportType, int reportNumber,    **
-**                  char *buffer, int size)                            **
-**                                                                      **
-**  Where:                                                              **
-**  "yk" is handle to open Yubikey                                     **
-**     "reportType" is HID report type (in, out or feature)            **
-**     "reportNumber" is report identifier                             **
-**     "buffer" is pointer to in buffer                                **
-**     "size" is size of the buffer                                    **
-**                                                                     **
-**     Returns: Nonzero if successful, zero otherwise                  **
-**                                                                      **
-*************************************************************************/
-
-static int hidSetReport(YUBIKEY *yk, int reportType, int reportNumber, char *buffer, int size)
-{
-    return usb_control_msg(yk, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_ENDPOINT_OUT, HID_SET_REPORT,
-                          reportType << 8 | reportNumber, 0, buffer, size, 1000) > 0;
-}
-
-/*************************************************************************
-**  function hidGetReport                                              **
-**  Get HID report                                                     **
-**                                                                      **
-**  int hidGetReport(YUBIKEY *yk, int reportType, int reportNumber,    **
-**                  char *buffer, int size)                            **
-**                                                                      **
-**  Where:                                                              **
-**  "yk" is handle to open Yubikey                                     **
-**     "reportType" is HID report type (in, out or feature)            **
-**     "reportNumber" is report identifier                             **
-**     "buffer" is pointer to in buffer                                **
-**     "size" is size of the buffer                                    **
-**                                                                     **
-**     Returns: Number of bytes read. Zero if failure                  **
-**                                                                      **
-*************************************************************************/
-
-static int hidGetReport(YUBIKEY *yk, int reportType, int reportNumber, char *buffer, int size)
-{
-  int m = usb_claim_interface(yk, 0);
-  printf ("m %d: %s\n", m, usb_strerror ());
-
-    return usb_control_msg(yk, USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_ENDPOINT_IN, HID_GET_REPORT,
-                                   reportType << 8 | reportNumber, 0, buffer, size, 1000) > 0;
-}
-
-/*************************************************************************
-**  function ykInit                                                    **
-**  Initiates libUsb and other stuff. Call this one first              **
-**                                                                      **
-**  void ykInit(void)                                                  **
-**                                                                      **
-*************************************************************************/
-
-int ykInit(void)
-{
-       usb_init();
-
-       if (usb_find_busses()) return usb_find_devices();
-
-       return 0;
-}
-
-/*************************************************************************
-**  function ykOpen                                                    **
-**  Opens first Yubikey found for subsequent operations                        **
-**                                                                      **
-**  YUBIKEY ykOpen(void)                                               **
-**                                                                      **
-**  Returns: Handle to opened Yubikey                                  **
-**                                                                      **
-*************************************************************************/
-
-YUBIKEY *ykOpen(void)
-{
-       struct usb_bus *bus;
-       struct usb_device *dev;
-
-       // Find first instance of the Yubikey
-
-       for (bus = usb_get_busses(); bus; bus = bus->next)
-               for (dev = bus->devices; dev; dev = dev->next)
-                       if (dev->descriptor.idVendor == YUBICO_VID && dev->descriptor.idProduct == YUBIKEY_PID)
-                               return (YUBIKEY *) usb_open(dev);
-
-       return (YUBIKEY *) 0;
-}
-
-/*************************************************************************
-**  function ykClose                                                   **
-**  Closes open Yubikey handle                                         **
-**                                                                      **
-**  void ykClose(void)                                                 **
-**                                                                      **
-*************************************************************************/
-
-void ykClose(YUBIKEY *yk)
-{
-       usb_close((usb_dev_handle *) yk);
-}
-
-/*************************************************************************
-**  function ykGetStatus                                               **
-**  Read the Yubikey status structure                                  **
-**                                                                      **
-**  int ykGetStatus(YUBIKEY *yk, STATUS *status, int forceUpdate)      **
-**                                                                      **
-**  Where:                                                              **
-**  "yk" is handle to open Yubikey                                     **
-**     "status" is pointer to returned status structure                **
-**     "forceUpdate" is set to nonzero to force update of dynamic fields **
-**                                                                     **
-**     Returns: Nonzero if successful, zero otherwise                  **
-**                                                                      **
-*************************************************************************/
-
-int ykGetStatus(YUBIKEY *yk, STATUS *status, int forceUpdate)
-{
-       unsigned char buf[FEATURE_RPT_SIZE];
-
-       // Read status structure
-
-       memset(buf, 0, sizeof(buf));
-
-       if (!hidGetReport(yk, REPORT_TYPE_FEATURE, 0, buf, FEATURE_RPT_SIZE)) return 0;
-
-       memcpy(status, buf + 1, sizeof(STATUS)); 
-       ENDIAN_SWAP(status->touchLevel);
-
-       // If force update, force Yubikey to update its dynamic
-       // status value(s)
-
-       if (forceUpdate) {
-               memset(buf, 0, sizeof(buf));
-               buf[FEATURE_RPT_SIZE - 1] = 0x8a;       // Invalid partition = update only
-               hidSetReport(yk, REPORT_TYPE_FEATURE, 0, buf, FEATURE_RPT_SIZE);
-       }
-
-       return 1;
-}
-
-/*************************************************************************
-**  function ykWriteSlot                                               **
-**  Writes data to Yubikey slot                                                **
-**                                                                      **
-**  static int ykWriteSlot(YUBIKEY *yk, unsigned char slot,            **
-**                        const void *buf, int bcnt)                   **
-**                                                                      **
-**  Where:                                                              **
-**  "yk" is handle to open Yubikey                                     **
-**     "slot" is slot number to write to                               **
-**     "buf" is pointer to write data buffer                           **
-**     "bcnt" is number of bytes to write                              **
-**                                                                     **
-**     Returns: Nonzero if successful, zero otherwise                  **
-**                                                                      **
-*************************************************************************/
-
-static int ykWriteSlot(YUBIKEY *yk, unsigned char slot, const void *dt, int bcnt)
-{
-       unsigned char buf[FEATURE_RPT_SIZE], data[SLOT_DATA_SIZE + FEATURE_RPT_SIZE];
-       int i, j, pos, part;
-
-       // Insert data and set slot #
-
-       memset(data, 0, sizeof(data));
-       memcpy(data, dt, bcnt);
-       data[SLOT_DATA_SIZE] = slot;
-
-       // Append slot checksum
-
-       i = getCRC(data, SLOT_DATA_SIZE);
-       data[SLOT_DATA_SIZE + 1] = (unsigned char) (i & 0xff);
-       data[SLOT_DATA_SIZE + 2] = (unsigned char) (i >> 8);
-
-       // Chop up the data into parts that fits into the payload of a
-       // feature report. Set the part number | 0x80 in the end
-       // of the feature report. When the Yubikey has processed it,
-       // it will clear this byte, signaling that the next part can be sent
-
-       for (pos = 0, part = 0x80; pos < (SLOT_DATA_SIZE + 4); part++) {
-
-               // Ignore parts that are all zeroes except first and last
-               // to speed up the transfer
-
-               for (i = j = 0; i < (FEATURE_RPT_SIZE - 1); i++) if (buf[i] = data[pos++]) j = 1;
-               if (!j && (part > 0x80) && (pos < SLOT_DATA_SIZE)) continue;
-
-               buf[i] = part;
-
-               if (!hidSetReport(yk, REPORT_TYPE_FEATURE, 0, buf, FEATURE_RPT_SIZE)) return 0;
-
-               // When the last byte in the feature report is cleared by
-               // the Yubikey, the next part can be sent
-
-               for (i = 0; i < 50; i++) {
-                       memset(buf, 0, sizeof(buf));
-                       if (!hidGetReport(yk, REPORT_TYPE_FEATURE, 0, buf, FEATURE_RPT_SIZE)) return 0; 
-                       if (!buf[FEATURE_RPT_SIZE - 1]) break;
-                       sleep(10);
-               }
-
-               // If timeout, something has gone wrong
-
-               if (i >= 50) return 0;  
-       }
-
-       return 1;
-}
-
-/*************************************************************************
-**  function ykWriteConfig                                             **
-**  Writes key config structure                                                **
-**                                                                      **
-**  int ykGetStatus(YUBIKEY *yk, STATUS *status, unsigned char accCode)        **
-**                                                                      **
-**  Where:                                                              **
-**  "yk" is handle to open Yubikey                                     **
-**     "cfg" is pointer to configuration structure. NULL to zap        **
-**     "accCode" is current program access code. NULL if none          **
-**                                                                     **
-**     Returns: Nonzero if successful, zero otherwise                  **
-**                                                                      **
-*************************************************************************/
-
-int ykWriteConfig(YUBIKEY *yk, CONFIG *cfg, unsigned char *accCode)
-{
-       unsigned char buf[sizeof(CONFIG) + ACC_CODE_SIZE];
-       STATUS stat;
-       int seq;
-
-       // Get current seqence # from status block
-
-       if (!ykGetStatus(yk, &stat, 0)) return 0;
-
-       seq = stat.pgmSeq;
-
-       // Update checksum and insert config block in buffer if present
-
-       memset(buf, 0, sizeof(buf));
-
-       if (cfg) {
-               cfg->crc = ~getCRC((unsigned char *) cfg, sizeof(CONFIG) - sizeof(cfg->crc));
-               ENDIAN_SWAP(cfg->crc);
-               memcpy(buf, cfg, sizeof(CONFIG));
-       }
-
-       // Append current access code if present
-
-       if (accCode) memcpy(buf + sizeof(CONFIG), accCode, ACC_CODE_SIZE);
-
-       // Write to Yubikey
-
-       if (!ykWriteSlot(yk, SLOT_CONFIG, buf, sizeof(buf))) return 0;
-
-       // Verify update
-
-       if (!ykGetStatus(yk, &stat, 0)) return 0;
-
-       if (cfg) return stat.pgmSeq != seq;
-
-       return stat.pgmSeq == 0;
-}
diff --git a/common/yubikey.h b/common/yubikey.h
deleted file mode 100644 (file)
index 63c0660..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************\r
-**                                                                      **\r
-**      Y U B I K E Y  -  Basic LibUSB programming API for the Yubikey **\r
-**                                                                      **\r
-**      Copyright 2008 Yubico AB                                       **\r
-**                                                                      **\r
-**      Date           / Sig / Rev  / History                          **\r
-**      2008-06-05     / J E / 0.00 / Main                             **\r
-**                                                                      **\r
-**************************************************************************\r
-**\r
-**     For binary compatibility, ykdef structures must be byte-aligned\r
-**     Furthermore - define ENDIAN_SWAP appropriately\r
-*/\r
-\r
-#ifdef _WIN32\r
-#pragma pack(push, 1)\r
-#endif\r
-\r
-#include <ykdef.h>\r
-\r
-#ifdef _WIN32\r
-#pragma pack(pop)\r
-#endif\r
-\r
-#ifdef _WIN32\r
-// Little endian\r
-#define        ENDIAN_SWAP(x)\r
-#else\r
-// Big endian\r
-#define        ENDIAN_SWAP(x)  x = ((x) >> 8) | ((x) << 8)\r
-#endif\r
-\r
-typedef void YUBIKEY;\r
-\r
-extern int ykInit(void);\r
-extern YUBIKEY *ykOpen(void);\r
-extern void ykClose(YUBIKEY *);\r
-extern int ykGetStatus(YUBIKEY *, STATUS *, int);\r
-extern int ykWriteConfig(YUBIKEY *, CONFIG *, unsigned char *);\r