* Some cleanups
authordocelic <docelic@ubuntu2.neaspec.com>
Fri, 15 Aug 2008 22:19:45 +0000 (17:19 -0500)
committerdocelic <docelic@ubuntu2.neaspec.com>
Fri, 15 Aug 2008 22:19:45 +0000 (17:19 -0500)
README
src/Makefile
src/aes.c
src/config.h
src/eedata.S
src/fstest.c
src/hal-emu.c
src/skipjack.c
src/tea.c

diff --git a/README b/README
index 6f6a111..7056933 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-                  ******  ******  ***   **     ****      **** 
+                  *****   ******  ***   **     ****      **** 
                  **   **    **    ** * * **  ********  ***
                  ** * **    **    **  *  **  ********      ***
                  **   **    **    **     **    ****      ****
index 73eb8b5..1ee2a1c 100644 (file)
@@ -2,24 +2,27 @@
 #
 # ATMOS Makefile
 # C 2008 Davor Ocelic, docelic@spinlocksolutions.com
+# http://techpubs.spinlocksolutions.com/atmos/
 #
 
-# Your programmer device (as required by programmer
-# software)
-PROG=stk500v1
-PORT=/dev/ttyS0
-
-# Smartcard chip name as recognized by avr libc
+# Smartcard chip name on your card,
+# as recognized by avr libc
 #ARCH=at90s2323
 #ARCH=at90s8515
 #ARCH=at90s8535
 #ARCH=atmega161
 ARCH=atmega163
 
+# Your programmer device (as required
+# by programmer software)
+PROG=stk500v1
+PORT=/dev/ttyS0
+
 # Size of the external EEPROM on the smartcard. Atmel's sizes are
-# usually in bits (i.e. AT90(256) and 24C256 are both 32 KByte).
-# 00: none, 01: 16KB, 02: 32KB, 03: 64KB,
-# 04: 128KB, 05: 256KB, FF: unspec.,
+# usually in kilobits (i.e. AT90(256) and 24C256 are both 32 KByte).
+# Here we set it in kilobytes, so divide by 8.
+# 00: none, 01: 16KB, 02: 32KB, 03: 64KB, 04: 128KB,
+# 05: 256KB, 06: 512KB, 07: 1024KB, 08: 2048KB, FF: unspec.,
 EXT_EEPROM_SIZE=0x02
 
 # The usual compile options
index 1258950..54e0940 100644 (file)
--- a/src/aes.c
+++ b/src/aes.c
@@ -6,8 +6,6 @@
   files http://www.iaik.tu-graz.ac.at/teaching/10_seminare-projekte/01_Telematik%20Bakkalaureat/EfficientAESImplemetation.pdf, 
   http://www.iaik.tu-graz.ac.at/teaching/10_seminare-projekte/01_Telematik%20Bakkalaureat/projectpaper_pletzer.pdf,
   http://www.iaik.tu-graz.ac.at/teaching/10_seminare-projekte/01_Telematik%20Bakkalaureat/Seminararbeit_Pletzer.pdf
-
-  $Id: aes.c,v 1.6 2003/04/02 23:57:54 m Exp $
 */
 
 #include <config.h>
@@ -261,5 +259,5 @@ iu8 xtime(iu8 value)
   return ((value & 0x80) ? (value<<1)^0x1b : value<<1) ;
 }
 
-#endif /* CONF_WITH_CRYPT_ALGO==0 */
+#endif /* CONF_WITH_CRYPT_ALGO==3 */
 
index fc7071d..ed0536a 100644 (file)
   If set to 1, functions impelementing calculations with challenges are
   included. This is a requirement for CONF_WITH_KEY_CMDS.
 */
-#define CONF_WITH_KEYAUTH       0
+#define CONF_WITH_KEYAUTH       1
 
 /*! \brief En-/disables key related commands.
   If set to 1, commands EXTERNAL KEYENTIFICATION, GET CHALLENGE,
   INTERNAL KEYENTIFICATION and VERIFY KEY are included.
 */
-#define CONF_WITH_KEYCMDS       0
+#define CONF_WITH_KEYCMDS       1
 
 /*! \brief En-/disables support for the external (I2C) EEPROM.
  *  Atmel chips have internal EEPROM integrated onto the card, usually
   - 2: NEWDES-SK
 */
 //#define CONF_WITH_CRYPT_ALGO    0 /* TEA */
-//#define CONF_WITH_CRYPT_ALGO    1 /* Skipjack */
+#define CONF_WITH_CRYPT_ALGO    1 /* Skipjack */
 //#define CONF_WITH_CRYPT_ALGO    2 /* NEWDES-SK */
-#define CONF_WITH_CRYPT_ALGO    3 /* AES */
+//#define CONF_WITH_CRYPT_ALGO    3 /* AES */
 
 
 /* Verify dependencies */
  *                       03: 64 KB
  *                       04: 128 KB
  *                       05: 256 KB
+ *                       06: 512 KB
+ *                       07: 1024 KB
+ *                       08: 2048 KB
  *                       FF: unspec.
  *  ARCH             Architecture type. Needed for assembler code and returned
  *                     as part of card's ATR signature. (Note that this setting
index 9463c11..e9c52fa 100644 (file)
@@ -3,7 +3,7 @@
 #include <config.h>
 
 ; The _ADDR comments correspond to memory offsets as defined in 
-; config.h. They are included here for easy navigation and telling
+; config.h. They are included here for easy navigation and seeing
 ; what data goes where.
 
        .text
 ; ATR_LEN_ADDR
        .byte   0x0F ; 15 bytes. (Max 28).
 ; ATR_ADDR
-  ; TS:  3B - direct convention
-  ; T0:  AA - TB1/TD1 follows,  historical bytes
-  ; TB1:  00 - no Vpp
-  ; TD1:  40 - TC2 follows
-  ; TC2:  20 - WI (0A = 10 = 1 second, 0x20 = 3.2 seconds)
-  ; T1-T5: 53 4F 53 53 45 - "SOSSE"
-  ; T6-T8: 02 03 25 - BCD coded compile date
-  ; T9:  01 - Chip type (see bottom of config.h)
-  ; T10:  03 - External EEPROM size (see bottom of config.h)
-       .byte   0x3B, 0xAA, 0x00, 0x40, 0x20, 0x53, 0x4F, 0x53
-       .byte   0x53, 0x45, YEAR, MONTH, DAY, CHIP, ESIZ, 0x00
+  ; Byte:  Value:
+  ; TS:    3B - direct convention
+  ; T0:    AA - TB1/TD1 follows,  historical bytes
+  ; TB1:   00 - no Vpp
+  ; TD1:   40 - TC2 follows
+  ; TC2:   20 - WI, card timeout (0A = 10 = 1second, 0x20 = 3.2s)
+  ; T1-T5: 41 54 4D 4F 53 - "ATMOS"
+  ; T6-T8: YEAR/MONTH/DAY - BCD coded compile date
+  ; T9:    CHIP - Chip type (see bottom of config.h)
+  ; T10:   ESIZ - External EEPROM size (see bottom of config.h)
+       .byte   0x3B, 0xAA, 0x00, 0x40, 0x20, 0x41, 0x54, 0x4D
+       .byte   0x4F, 0x53, YEAR, MONTH, DAY, CHIP, ESIZ, 0x00
        .byte   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
        .byte   0x00, 0x00, 0x00, 0x00
 ; SERNUM_ADDR
index a10ae24..563015b 100644 (file)
@@ -84,8 +84,8 @@ int main( int argc, char *argv[] )
        printf( "fs.size=%.4X\n", fs.size );
        printf( "fs.pos=%.4X\n", fs.pos );
 
-       printf( "fstream_write( &fs, {0x12,0x34,0x56} , 3 )\n" );
-       if( !fstream_write( &fs, "\x12\x34\x56" , 3 ) ) goto reterror;
+       printf( "fstream_write( &fs, (iu8*){0x12,0x34,0x56} , 3 )\n" );
+       if( !fstream_write( &fs, (iu8*)"\x12\x34\x56" , 3 ) ) goto reterror;
 
        fs.pos-=2;
 
index 589f97d..3dac173 100644 (file)
@@ -188,7 +188,11 @@ bool hal_eeprom_read( iu8 *dst, iu16 src, iu8 len )
 
        while( len-- ) {
                if( (unsigned int)src>=sizeof(eeprom) ) {
+#if CONF_WITH_RETCODEMGR
+                       sw_set( SW_OTHER );
+#else
                        sw_set( 0x6F00 );
+#endif
                        return FALSE;
                }
 #ifdef DEBUG
@@ -212,7 +216,11 @@ bool hal_eeprom_write( iu16 dst, iu8 *src, iu8 len )
 
        while( len-- ) {
                if( (unsigned int)dst>=sizeof(eeprom) ) {
+#if CONF_WITH_RETCODEMGR
+                       sw_set( SW_OTHER );
+#else
                        sw_set( 0x6F00 );
+#endif
                        return FALSE;
                }
 #ifdef DEBUG
index ccfd106..a8e04fd 100644 (file)
 #define W4_R   7
 
 static const CODE iu8 fTable[256] = { 
-       0xa3,0xd7,0x09,0x83,0xf8,0x48,0xf6,0xf4,0xb3,0x21,0x15,0x78,0x99,0xb1,0xaf,0xf9,
-       0xe7,0x2d,0x4d,0x8a,0xce,0x4c,0xca,0x2e,0x52,0x95,0xd9,0x1e,0x4e,0x38,0x44,0x28,
-       0x0a,0xdf,0x02,0xa0,0x17,0xf1,0x60,0x68,0x12,0xb7,0x7a,0xc3,0xe9,0xfa,0x3d,0x53,
-       0x96,0x84,0x6b,0xba,0xf2,0x63,0x9a,0x19,0x7c,0xae,0xe5,0xf5,0xf7,0x16,0x6a,0xa2,
-       0x39,0xb6,0x7b,0x0f,0xc1,0x93,0x81,0x1b,0xee,0xb4,0x1a,0xea,0xd0,0x91,0x2f,0xb8,
-       0x55,0xb9,0xda,0x85,0x3f,0x41,0xbf,0xe0,0x5a,0x58,0x80,0x5f,0x66,0x0b,0xd8,0x90,
-       0x35,0xd5,0xc0,0xa7,0x33,0x06,0x65,0x69,0x45,0x00,0x94,0x56,0x6d,0x98,0x9b,0x76,
-       0x97,0xfc,0xb2,0xc2,0xb0,0xfe,0xdb,0x20,0xe1,0xeb,0xd6,0xe4,0xdd,0x47,0x4a,0x1d,
-       0x42,0xed,0x9e,0x6e,0x49,0x3c,0xcd,0x43,0x27,0xd2,0x07,0xd4,0xde,0xc7,0x67,0x18,
-       0x89,0xcb,0x30,0x1f,0x8d,0xc6,0x8f,0xaa,0xc8,0x74,0xdc,0xc9,0x5d,0x5c,0x31,0xa4,
-       0x70,0x88,0x61,0x2c,0x9f,0x0d,0x2b,0x87,0x50,0x82,0x54,0x64,0x26,0x7d,0x03,0x40,
-       0x34,0x4b,0x1c,0x73,0xd1,0xc4,0xfd,0x3b,0xcc,0xfb,0x7f,0xab,0xe6,0x3e,0x5b,0xa5,
-       0xad,0x04,0x23,0x9c,0x14,0x51,0x22,0xf0,0x29,0x79,0x71,0x7e,0xff,0x8c,0x0e,0xe2,
-       0x0c,0xef,0xbc,0x72,0x75,0x6f,0x37,0xa1,0xec,0xd3,0x8e,0x62,0x8b,0x86,0x10,0xe8,
-       0x08,0x77,0x11,0xbe,0x92,0x4f,0x24,0xc5,0x32,0x36,0x9d,0xcf,0xf3,0xa6,0xbb,0xac,
-       0x5e,0x6c,0xa9,0x13,0x57,0x25,0xb5,0xe3,0xbd,0xa8,0x3a,0x01,0x05,0x59,0x2a,0x46
+0xa3,0xd7,0x09,0x83,0xf8,0x48,0xf6,0xf4,0xb3,0x21,0x15,0x78,0x99,0xb1,0xaf,0xf9,
+0xe7,0x2d,0x4d,0x8a,0xce,0x4c,0xca,0x2e,0x52,0x95,0xd9,0x1e,0x4e,0x38,0x44,0x28,
+0x0a,0xdf,0x02,0xa0,0x17,0xf1,0x60,0x68,0x12,0xb7,0x7a,0xc3,0xe9,0xfa,0x3d,0x53,
+0x96,0x84,0x6b,0xba,0xf2,0x63,0x9a,0x19,0x7c,0xae,0xe5,0xf5,0xf7,0x16,0x6a,0xa2,
+0x39,0xb6,0x7b,0x0f,0xc1,0x93,0x81,0x1b,0xee,0xb4,0x1a,0xea,0xd0,0x91,0x2f,0xb8,
+0x55,0xb9,0xda,0x85,0x3f,0x41,0xbf,0xe0,0x5a,0x58,0x80,0x5f,0x66,0x0b,0xd8,0x90,
+0x35,0xd5,0xc0,0xa7,0x33,0x06,0x65,0x69,0x45,0x00,0x94,0x56,0x6d,0x98,0x9b,0x76,
+0x97,0xfc,0xb2,0xc2,0xb0,0xfe,0xdb,0x20,0xe1,0xeb,0xd6,0xe4,0xdd,0x47,0x4a,0x1d,
+0x42,0xed,0x9e,0x6e,0x49,0x3c,0xcd,0x43,0x27,0xd2,0x07,0xd4,0xde,0xc7,0x67,0x18,
+0x89,0xcb,0x30,0x1f,0x8d,0xc6,0x8f,0xaa,0xc8,0x74,0xdc,0xc9,0x5d,0x5c,0x31,0xa4,
+0x70,0x88,0x61,0x2c,0x9f,0x0d,0x2b,0x87,0x50,0x82,0x54,0x64,0x26,0x7d,0x03,0x40,
+0x34,0x4b,0x1c,0x73,0xd1,0xc4,0xfd,0x3b,0xcc,0xfb,0x7f,0xab,0xe6,0x3e,0x5b,0xa5,
+0xad,0x04,0x23,0x9c,0x14,0x51,0x22,0xf0,0x29,0x79,0x71,0x7e,0xff,0x8c,0x0e,0xe2,
+0x0c,0xef,0xbc,0x72,0x75,0x6f,0x37,0xa1,0xec,0xd3,0x8e,0x62,0x8b,0x86,0x10,0xe8,
+0x08,0x77,0x11,0xbe,0x92,0x4f,0x24,0xc5,0x32,0x36,0x9d,0xcf,0xf3,0xa6,0xbb,0xac,
+0x5e,0x6c,0xa9,0x13,0x57,0x25,0xb5,0xe3,0xbd,0xa8,0x3a,0x01,0x05,0x59,0x2a,0x46
 };
 
 #ifdef INLINE
index 3e473da..d444741 100644 (file)
--- a/src/tea.c
+++ b/src/tea.c
@@ -133,4 +133,3 @@ void tea_dec( iu32 *v, iu32 *k )
 
 #endif /* CONF_WITH_CRYPT_ALGO==0 */
 
-