diff --git a/Makefile b/Makefile index af60ab5..8413b01 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,8 @@ # DEV_CYGWIN = FALSE # USE_HSM = TRUE -DEV_CYGWIN = TRUE -#USE_HSM = TRUE +DEV_CYGWIN = FALSE +USE_HSM = TRUE ifeq ($(USE_HSM),TRUE) diff --git a/cr_generate_id_private.h b/cr_generate_id_private.h index 9828e46..bb8d468 100644 --- a/cr_generate_id_private.h +++ b/cr_generate_id_private.h @@ -129,7 +129,7 @@ extern "C" { #include #include "ec_lcl.h" // EC_KEY (=ec_key_st) 構造体の参照に必要 -#define DEBUG_PRINT 1 +//#define DEBUG_PRINT 1 //#define DEBUG_DEVICE_CERT_OUTPUT_FILE //#define DEBUG_EFUSE_ID_OUTPUT_FILE @@ -141,7 +141,8 @@ extern "C" { #define ENCRYPT_AES 1 // 定義を有効でFIX.(これが未定義の場合、IDの暗号化がRSAになる。) -#define CR_GEN_ID_VERSION 1 +#define CR_GEN_ID_VERSION 2 // シャープへのリリースごとにUPする。 + // 2010/01/13 Release ver.2 #ifdef USE_HSM #define CR_GEN_ID_MAGICCODE 0xdeadb00f; /* 最終的にはこちらで動作。0xdeadbeefにするとRSAでコケる。 */ #else // !USE_HSM diff --git a/package.csh b/package.csh deleted file mode 100644 index cd9c8da..0000000 --- a/package.csh +++ /dev/null @@ -1,27 +0,0 @@ -#!c:/tcsh/tcsh.exe - -set mydir="cr_generate_id" - -set myfiles="Makefile.sharp main.c cr_generate_id.h libgenid.a readme_openssl.txt LICENSE_en.txt LICENSE_jp.txt readme.txt readme_openssl.txt" - - -if(-e $mydir.zip) then - rm -f $mydir.zip -endif - -if(-d $mydir ) then - rm -rf $mydir -endif - -mkdir $mydir - -foreach myfile ($myfiles) - if(-e $mydir/$myfile) then - rm -f $mydir/$myfile - endif - cp $myfile $mydir/$myfile -end - -mv $mydir/Makefile.sharp $mydir/Makefile - -zip $mydir.zip $mydir/* diff --git a/package.sh b/package.sh deleted file mode 100644 index bb5bdde..0000000 --- a/package.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/sh - -mydir="generate_id" -echo $mydir - -myfiles="Makefile.sharp main.c cr_generate_id.h libgenid.a readme_openssl.txt LICENSE_en.txt LICENSE_jp.txt readme.txt readme_openssl.txt" - - -if [ -e mydir.zip ] -then - rm -f $mydir.zip -fi - -if [ -e $mydir ] -then - rm -rf $mydir -fi - -mkdir $mydir - -for myfile in $myfiles -do - if [ -e $mydir/$myfile ] - then - rm -f $mydir/$myfile - fi - cp $myfile $mydir/$myfile -done - -mv $mydir/Makefile.sharp $mydir/Makefile - -zip $mydir.zip $mydir/*