diff --git a/trunk/Makefile.sharp b/trunk/Makefile.sharp
index d1d01b8..c4ae3b0 100644
--- a/trunk/Makefile.sharp
+++ b/trunk/Makefile.sharp
@@ -10,8 +10,8 @@ OBJS	= $(notdir $(SRCS:.c=.o))
 
 ifeq ($(DEV_CYGWIN),TRUE)
 
-CC      := C:/Cygwin/bin/gcc
-LD	     = C:/Cygwin/bin/gcc
+CC      := C:/Cygwin/bin/gcc-3
+LD	     = C:/Cygwin/bin/gcc-3
 CFLAGS	+= -mno-cygwin -DDEV_CYGWIN -Wall -I./
 LDFLAGS	+= -Wl,--subsystem,console -mwindows -mno-cygwin  -L./
 LDLIBS	+= -lgenid
diff --git a/trunk/Makefile.testSharpID b/trunk/Makefile.testSharpID
index ae9f62f..273f174 100644
--- a/trunk/Makefile.testSharpID
+++ b/trunk/Makefile.testSharpID
@@ -108,8 +108,8 @@ LDLIBS	= -lcrypto -lssl
 MERGE_PROG = merge_lib_objs.plx
 
 ifeq ($(DEV_CYGWIN),TRUE)
-CC := C:/Cygwin/bin/gcc
-LD	= C:/Cygwin/bin/gcc
+CC := C:/Cygwin/bin/gcc-3
+LD	= C:/Cygwin/bin/gcc-3
 CFLAGS	+= -mno-cygwin -DDEV_CYGWIN
 LDFLAGS	+= -Wl,--subsystem,console -mno-cygwin
 TARGET_DEL	= $(TARGET).exe
diff --git a/trunk/cr_generate_id_private.h b/trunk/cr_generate_id_private.h
index e4490e1..087848b 100644
--- a/trunk/cr_generate_id_private.h
+++ b/trunk/cr_generate_id_private.h
@@ -137,10 +137,9 @@ extern "C" {
 
 #define ENCRYPT_AES             1           // 定義を有効でFIX.（これが未定義の場合、IDの暗号化がRSAになる。）
 
-#define CR_GEN_ID_VERSION       6           // シャープへのリリースごとにUPする。
+#define CR_GEN_ID_VERSION       5           // シャープへのリリースごとにUPする。
                                             // 2010/02/02 Release ver.4
                                             // 2010/03/15 Release ver.5
-// TBD -----------------------------------> // 2013/06/XX Release ver.6
 #ifdef USE_HSM
 #define CR_GEN_ID_MAGICCODE     0xdeadb00f; /* 最終的にはこちらで動作。0xdeadbeefにするとRSAでコケる。 */
 #else // !USE_HSM
diff --git a/trunk/main3.c b/trunk/main3.c
index 73ae699..fe0df9c 100644
--- a/trunk/main3.c
+++ b/trunk/main3.c
@@ -1,3 +1,27 @@
+/*
+    testSharpID 縺ｫ蟇ｾ蠢懊＠縺溘ヵ繧ｩ繝ｼ繝槭ャ繝医〒 ID 縺ｮ蜃ｺ蜉帙ｒ陦後＞縺ｾ縺吶��
+
+    *豕ｨ諢�1* HSM 縺ｮ菴ｿ縺医ｋ迺ｰ蠅�(Linux) 縺ｧ蜃ｺ蜉帙＠縺溘ヵ繧｡繧､繝ｫ繧� Windows(Cygwin) 縺ｧ讀懆ｨｼ縺吶ｋ蝣ｴ蜷医��
+    譁�蟄励さ繝ｼ繝峨ｒ Shift-JIS 縺ｮ CR+LF 縺ｨ縺励※隗｣驥医☆繧九◆繧√≧縺ｾ縺上＞縺阪∪縺帙ｓ(2縺､繧√�ｮ繝ｬ繧ｳ繝ｼ繝峨〒繧ｳ繧ｱ繧�)
+    Windows 蛛ｴ縺ｧ讀懆ｨｼ縺吶ｋ蝣ｴ蜷医�ｯ LF 縺ｨ縺励※菫晏ｭ倥＠縺ｪ縺翫☆蠢�隕√′縺ゅｊ縺ｾ縺吶��
+
+    *豕ｨ諢�2*
+    testSharpID 縺ｧ讀懆ｨｼ縺吶ｋ蝣ｴ蜷医�ｯ逵溘�ｮ骰ｵ縺ｧ陦後≧蠢�隕√′縺ゅｊ縺ｾ縺吶��
+    縺昴�ｮ縺溘ａ testSharpID 縺ｫ縺翫＞縺ｦ
+
+    (1) dummyKey 繝輔か繝ｫ繝�縺ｮ dev, prod 縺昴ｌ縺槭ｌ縺ｫ蟇ｾ縺励※
+        eFuse_aesKey.bin, eFuse_privKey.der, eFuse_pubKey.der 繧貞ｷｮ縺玲崛縺医ｋ (莉悶�ｯ縺昴�ｮ縺ｾ縺ｾ縺ｧ OK)
+
+    (2) realKey 繝輔か繝ｫ繝�縺ｮ dev, prod 縺昴ｌ縺槭ｌ縺ｫ蟇ｾ縺励※
+        eFuse_aesKey.bin, eFuse_privKey.der, eFuse_pubKey.der 繧堤ｽｮ縺上��
+        dummyKey 繝輔か繝ｫ繝�縺ｮ dev, prod 縺ｮ NCT2_priv.der, NCT2_priv.pem, NCT2_pub.pem 繧堤ｽｮ縺上��
+        荳願ｨ倥ｒ陦後▲縺滉ｸ翫〒 Makefile.testSharpID 縺ｮ ifeq ($(USE_DUMMY_KEY),TRUE) endif 縺ｮ髢薙↓縺ゅｋ
+        DEV_DER_KEY_DIR  = ./dummyKey/dev  -> ./realKey/dev
+        PROD_DER_KEY_DIR = ./dummyKey/prod -> ./realKey/prod
+        縺ｨ螟画峩縺吶ｋ縲�
+
+    縺ｮ縺�縺･繧後°縺ｮ蟇ｾ蠢懊ｒ縺励∪縺吶��
+*/
 
 #define RAND_MAX 0xffffffff
 #include <stdio.h>
@@ -32,138 +56,152 @@ static struct termios initial_setting, new_setting;
 static int peek_character = -1;
 void keyboard_initialize( void )
 {
-	tcgetattr( 0, &initial_setting );
-	new_setting = initial_setting;
-	new_setting.c_lflag &= ~ICANON;
-	new_setting.c_lflag &= ~ECHO;
-	new_setting.c_lflag &= ~ISIG;
-	new_setting.c_cc[VMIN] = 0;
-	new_setting.c_cc[VTIME] = 0;
-	tcsetattr( 0, TCSANOW, &initial_setting );
+    tcgetattr( 0, &initial_setting );
+    new_setting = initial_setting;
+    new_setting.c_lflag &= ~ICANON;
+    new_setting.c_lflag &= ~ECHO;
+    new_setting.c_lflag &= ~ISIG;
+    new_setting.c_cc[VMIN] = 0;
+    new_setting.c_cc[VTIME] = 0;
+    tcsetattr( 0, TCSANOW, &initial_setting );
 }	// keyboard_initialize
 
 void keyboard_finalize( void )
 {
-	tcsetattr( 0, TCSANOW, &initial_setting );
+    tcsetattr( 0, TCSANOW, &initial_setting );
 }	// keyboard_finalize
 
 int kbhit( void )
 {
-	char ch;
-	int nread;
+    char ch;
+    int nread;
 	
 	if ( peek_character != -1 )
-		return 1;
-	new_setting.c_cc[VMIN] = 0;
-	tcsetattr( 0, TCSANOW, &new_setting );
-	nread = read( 0, &ch, 1 );
-	new_setting.c_cc[VMIN] = 1;
-	tcsetattr( 0, TCSANOW, &new_setting );
+    {
+        return 1;
+    }
+    new_setting.c_cc[VMIN] = 0;
+    tcsetattr( 0, TCSANOW, &new_setting );
+    nread = read( 0, &ch, 1 );
+    new_setting.c_cc[VMIN] = 1;
+    tcsetattr( 0, TCSANOW, &new_setting );
 	
-	if ( nread == 1 )
-	{
-		peek_character = ch;
-		return 1;
-	}
+    if ( nread == 1 )
+    {
+        peek_character = ch;
+        return 1;
+    }
 
-	return 0;
-}	// kbhit
+    return 0;
+} // kbhit
 
 int getch( void )
 {
-	char ch;
-	
-	if ( peek_character != -1 )
-	{
-		ch = peek_character;
-		peek_character = -1;
-		return ch;
-	}
-	read( 0, &ch, 1 );
-	return ch;
-}	// readch
+    char ch;
+
+    if ( peek_character != -1 )
+    {
+        ch = peek_character;
+        peek_character = -1;
+        return ch;
+    }
+    read( 0, &ch, 1 );
+    return ch;
+} // readch
 
 #endif // DEV_CYGWIN
 
 // char *str = "0x11111111";
 static int str_to_u32(u32 *num, const char *str)
 {
-  u32 c;
-  int shift = 0;
-  char *s;
-  int hex_mode = 0;
+    u32 c;
+    int shift = 0;
+    char *s;
+    int hex_mode = 0;
 
-  *num = 0;
+    *num = 0;
 
-  if( *str == '0' && *(str+1) == 'x' ) {
-    hex_mode = 1;
-    s = (char *)(str + 2);
-  }
-  else {
-    s = (char *)str;
-  }
+    if( *str == '0' && *(str+1) == 'x' )
+    {
+        hex_mode = 1;
+        s = (char *)(str + 2);
+    }
+    else
+    {
+        s = (char *)str;
+    }
   
-  while( *s != '\0' ) {
+    while( *s != '\0' )
+    {
 
-    if( shift > 8 ) {
-      return -1; /* error */
-    }
+        if( shift > 8 )
+        {
+            return -1; /* error */
+        }
 
-    if( hex_mode ) {
-      if( '0' <= *s && *s <= '9' ) {
-	c = (u32)(*s - '0');
-      }
-      else if( 'a' <= *s && *s <= 'f' ) {
-	c = (u32)(*s - 'a') + 10;
-      }
-      else if( 'A' <= *s && *s <= 'F' ) {
-	c = (u32)(*s - 'A') + 10;
-      }
-      else {
-	return -1; /* error */
-      }
-      *num <<= 4;
-      *num |= c;
+        if( hex_mode )
+        {
+            if( '0' <= *s && *s <= '9' )
+            {
+                c = (u32)(*s - '0');
+            }
+            else if( 'a' <= *s && *s <= 'f' )
+            {
+                c = (u32)(*s - 'a') + 10;
+            }
+            else if( 'A' <= *s && *s <= 'F' )
+            {
+                c = (u32)(*s - 'A') + 10;
+            }
+            else
+            {
+                return -1; /* error */
+            }
+            *num <<= 4;
+            *num |= c;
+        }
+        else
+        {
+            if( '0' <= *s && *s <= '9' )
+            {
+                c = (u32)(*s - '0');
+            }
+            else
+            {
+                return -1; /* error */
+            }
+            *num *= 10;
+            *num += c;
+        }
+        shift++;
+        s++;
     }
-    else {
-      if( '0' <= *s && *s <= '9' ) {
-	c = (u32)(*s - '0');
-      }
-      else {
-	return -1; /* error */
-      }
-      *num *= 10;
-      *num += c;
-    }
-    shift++;
-    s++;
-  }
   
-  return 0;
+    return 0;
 }
 
 static double gettimeofday_sec(void)
 {
-  struct timeval tv;
+    struct timeval tv;
 
 #if 0
-  struct timeval {
-    time_t      tv_sec;     /* 遘� */
-    suseconds_t tv_usec;    /* 繝槭う繧ｯ繝ｭ遘� */
-  };
+    struct timeval
+    {
+        time_t      tv_sec;     /* 遘� */
+        suseconds_t tv_usec;    /* 繝槭う繧ｯ繝ｭ遘� */
+    };
       
-  struct timezone {
-    int tz_minuteswest;     /* 繧ｰ繝ｪ繝九ャ繧ｸ讓呎ｺ匁凾縺ｨ縺ｮ蟾ｮ (隘ｿ譁ｹ縺ｫ蛻�蜊倅ｽ�) */
-    int tz_dsttime;         /* 螟乗凾髢楢ｪｿ謨ｴ縺ｮ蝙� */
-  };
-
-  int gettimeofday(struct timeval *tv, struct timezone *tz);
+    struct timezone
+    {
+        int tz_minuteswest;     /* 繧ｰ繝ｪ繝九ャ繧ｸ讓呎ｺ匁凾縺ｨ縺ｮ蟾ｮ (隘ｿ譁ｹ縺ｫ蛻�蜊倅ｽ�) */
+        int tz_dsttime;         /* 螟乗凾髢楢ｪｿ謨ｴ縺ｮ蝙� */
+    };
 
+    int gettimeofday(struct timeval *tv, struct timezone *tz);
 #endif
 
-
-  gettimeofday(&tv, NULL);
-  return tv.tv_sec + (double)tv.tv_usec*1e-6;
+    gettimeofday(&tv, NULL);
+    return tv.tv_sec + (double)tv.tv_usec*1e-6;
 }
 
 int main(int ac, char *argv[])
@@ -218,7 +256,14 @@ int main(int ac, char *argv[])
     }
     else
     {
-        sprintf( path, "output/outputSharpID.txt" );
+        if (bonding_option == BONDING_OPTION_DEV)
+        {
+            sprintf( path, "output/outputSharpID_Dev.txt" );
+        }
+        else
+        {
+            sprintf( path, "output/outputSharpID_Prod.txt" );
+        }
     }
 
     // 繝輔ぃ繧､繝ｫ繧帝幕縺�
@@ -316,8 +361,16 @@ int main(int ac, char *argv[])
         }
 
         // 譖ｸ縺崎ｾｼ縺ｿ
-        fprintf( fp, "%08X, %08X %08X, %08X %08X, ",
-            (unsigned int)device_id[0], (unsigned int)device_id[2], (unsigned int)device_id[1], (unsigned int)device_id[4], (unsigned int)device_id[3] );
+        {
+            int i;
+            fprintf( fp, "%08X, %08X %08X, %08X %08X, ",
+                (unsigned int)device_id[0], (unsigned int)device_id[2], (unsigned int)device_id[1], (unsigned int)device_id[4], (unsigned int)device_id[3] );
+            for (i = 0; i < CR_ID_BUF_SIZE; i++ )
+            {
+                fprintf( fp, "%02X", id[i] );
+            }
+            fprintf( fp, "\n" );
+        }
 
         if (kbhit())
         {
@@ -335,46 +388,11 @@ int main(int ac, char *argv[])
                 goto end;
             }
         }
-    else 
-    {
-        cr_print_flag = 0;
+        else 
+        {
+            cr_print_flag = 0;
+        }
     }
-    }
-
-  if( ac == 4 ) {
-    if( 0 == str_to_u32(&device_id[0], argv[1]) && 0 == str_to_u32(&device_id[1], argv[2])  ) {
-      printf("ID[0] = 0x%08x\n", (unsigned int)device_id[0]);
-      printf("ID[1] = 0x%08x%08x\n", (unsigned int)device_id[2], (unsigned int)device_id[1] );
-      printf("ID[2] = 0x%08x%08x\n", (unsigned int)device_id[4], (unsigned int)device_id[3] );
-      fp = fopen( argv[3], "wb" );
-      if( fp == NULL ) {
-    fprintf(stderr, "failed to fopen %s\n",argv[3]);
-      }
-      else {
-    time_start = gettimeofday_sec();
-    if( 0 != cr_generate_id( device_id, id, bonding_option ) )
-    {
-      fprintf(stderr,"cr_generate_id failed s1=0x%08x s2_lo=0x%08x s2_hi=0x%08x\n",
-          (int)device_id[0], (int)device_id[1], (int)device_id[2]);
-    }
-    else {
-      time_end = gettimeofday_sec();
-      fwrite(id, CR_ID_BUF_SIZE, 1, fp);
-    }
-    fclose(fp);
-      }
-    }
-    else {
-      goto err_print;
-    }
-  }
-  else {
-  err_print:
-    fprintf(stderr,"Invalid argument!\n");
-    fprintf(stderr,"Usage: %s\n", argv[0]);
-    fprintf(stderr,"Usage: %s device_id(32bit) filename.dat\n", argv[0]);
-
-  }
 
 end:
     // 繝輔ぃ繧､繝ｫ縺ｮ繧ｯ繝ｭ繝ｼ繧ｺ