From dda074ee8bba8700b9ec43d4c5610895cf3db215 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@ff987cc8-cf2f-4642-8568-d52cce064691>
Date: Fri, 8 Jan 2010 08:07:22 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BBLinux=20+=20HSM=20=E3=81=A7=E3=81=AE?=
 =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=8C=E3=83=87=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=AB=E3=83=88=E3=81=AB=E3=81=AA=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=80=81Makefile=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=20?=
 =?UTF-8?q?=E3=83=BB=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7?=
 =?UTF-8?q?DEBUG=5FPRINT=E3=82=92=E3=82=AA=E3=83=95=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=80=82=20=E3=83=BB2010/1/13=E3=81=AE=E3=83=AA?=
 =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=82=B9=E3=81=AB=E5=90=91=E3=81=91=E3=81=A6?=
 =?UTF-8?q?=E3=80=81CR=5FGEN=5FID=5FVERSION=E3=82=92"2"=E3=81=AB=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@165 ff987cc8-cf2f-4642-8568-d52cce064691
---
 Makefile                 |  4 ++--
 cr_generate_id_private.h |  5 +++--
 package.csh              | 27 ---------------------------
 package.sh               | 32 --------------------------------
 4 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 package.csh
 delete mode 100644 package.sh

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 <openssl/ec.h>
 #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/*