From a3af41a78e4f24bdf9fc88b9d36fd5873502bec9 Mon Sep 17 00:00:00 2001
From: "atul.jha" <s8atjhaa@stud.uni-saarland.de>
Date: Fri, 22 May 2020 12:54:01 +0200
Subject: [PATCH] Backup 1

---
 trial1/layer1.c  |  13 +++++++++++--
 trial1/layer1.h  |   8 +++++++-
 trial1/layer2.c  |  19 +++++++++++--------
 trial1/layer2.h  |   5 ++++-
 trial1/out/main2 | Bin 13480 -> 13480 bytes
 5 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/trial1/layer1.c b/trial1/layer1.c
index c08858b..bc484b0 100644
--- a/trial1/layer1.c
+++ b/trial1/layer1.c
@@ -53,7 +53,7 @@ int readUDS(uint8_t* UDS_M)
 	if(!fp)
 		perror("Opening seed file to read failed\n");
 	
-	if (BIO_read(fp,UDSbuf,UDSsize) < 0)
+	if (BIO_read(fp,UDSbuf,UDSsize) < 0)		//Suspecting a ENDian issue in reading. data is half byte reversed
 		perror("BIO read failed\n");
 
 	//Compute hash of UDS
@@ -171,6 +171,15 @@ int calcCDID(uint8_t * UDS_M, uint8_t * FW_M, uint8_t * CDID)
 int _calcCDID(uint8_t * _CDID)
 {
 
+	/* 
+	***BUG*** : 
+	CDI hash value returned is not correct or consistent.
+	hash generated by readUDS() and readFWID() are correct and consistent but 
+	caclCDID() is broken. 
+
+	Do not use this wrapper function unless fixed
+	*/
+
 	BIO * out = BIO_new_fp(stdout, BIO_NOCLOSE);
 	BIO_printf(out, "\n");BIO_printf(out, "\n");BIO_printf(out, "\n");
 
@@ -203,4 +212,4 @@ int _calcCDID(uint8_t * _CDID)
 	BIO_free(out);
 
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/trial1/layer1.h b/trial1/layer1.h
index 7587675..e7f87c7 100644
--- a/trial1/layer1.h
+++ b/trial1/layer1.h
@@ -4,12 +4,18 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/sha.h>
+#include <openssl/ec.h>
+#include <openssl/pem.h>
+#include <openssl/kdf.h>
+
 
 #define SHA256_dig_t 32	//bytes
+#define ECC_curve 
 
 int readUDS(uint8_t* UDSdigest);
 int createUDS();
 int readFWID(uint8_t * FW_M);
 int calcCDID(uint8_t * UDS_M, uint8_t * FW_M, uint8_t * CDID);
-int _calcCDID(uint8_t * CDID);
+int _calcCDID(uint8_t * CDID);		//wrapper function broken, do not use
+
 
diff --git a/trial1/layer2.c b/trial1/layer2.c
index 256eaca..aac4f33 100644
--- a/trial1/layer2.c
+++ b/trial1/layer2.c
@@ -25,16 +25,19 @@ void startProtocol()
 	//setp 3 : Derive Composite Device ID
 	uint8_t* CD_ID = calloc(1,sizeof(uint8_t)*SHA256_dig_t);
 	calcCDID(UDS_ID,FW_ID,CD_ID);
-
-
-	uint8_t* _CD_ID = calloc(1,sizeof(uint8_t)*SHA256_dig_t);
-	_calcCDID(_CD_ID);
-	
-
-	//End block
 	free(UDS_ID);
 	free(FW_ID);
+
+	// uint8_t* _CD_ID = calloc(1,sizeof(uint8_t)*SHA256_dig_t);
+	// _calcCDID(_CD_ID);
+	
+	
+
+
+
+	//End block
+	
 	free(CD_ID);
-	free(_CD_ID);
+	// free(_CD_ID);
 }
 
diff --git a/trial1/layer2.h b/trial1/layer2.h
index 06361a1..93c0541 100644
--- a/trial1/layer2.h
+++ b/trial1/layer2.h
@@ -10,4 +10,7 @@
 
 #define SHA256_dig_t 32	//bytes
 
-void startProtocol();
\ No newline at end of file
+void startProtocol();
+
+int deriveKDF();
+int deriveECC_Key();
\ No newline at end of file
diff --git a/trial1/out/main2 b/trial1/out/main2
index 40f4da6e7f38351c48fdd6fe39d9a2d3242f88ee..19c3daac8739609fbcdc3e1f33d1237b8775c001 100755
GIT binary patch
delta 1085
zcmZuxT}%{L6ux(0WoO;L*&UsQxLpQ8Dvju{ikOOJHJc0sB|#RcDUzUp7&UDzZK9U6
zDOfw*ZUl~L_0_-1L(#ZC;1fZjMy19+SRxn;3T9d~uA+3Q(CN9mLbd5l=6+|sbIy0p
zJ##Z>cAnYUc8e$JB)Qt}^a%Y6llB}!Cmj+S%A4<-PQ>1+SiOC8QC7?Cv!?3rqer<v
z()g_wLez-u0S{rzWX*>>A^PNuVRSPUeXW@}iyIj`Jj>Shg;Z@!ZF%HGS3Pqr_}ehF
z;B-s#wDGAG$qyL$C6eLbv~~rF2DmeSbC!;3`nxEj1xLr%Bkg5z7K~HF!I&CZl?$7!
zS@a})Y!x%p(1#)4u$=jrqiVsp+R_{+i3(56aLT%b8#lwx)@<%qGfY_X=p}f|Cess8
zVv}eDYHWU51>YgF3c75c`|8sYg1rcO!^{5)MxoT6hq+DmRw0jtRIrd_TMF<FKl+Lt
zGHr!A$9}p81|7My8aQVz4M3hVODLF!IWMQ?a#ljE(@!g)-6?0RFkxlwYI3BJ_*~2_
z6ZAU^xRKNjArqUI1&Qv4HG-dh0(%4*n?EdUq9(W}NEwe)UXv*MGa;el#BQg6!?lYl
zaKPoq{j5u-F8IYI(SG<HnLhBkWgO^xZizO+7Pp^<AdE~Q{Nye+>3BXJp13niF?Le0
ziy2?U)o=)(jf~M%?I!lEZ%vK@U$5#rUc71_?V6+=XM8!@ZP)r59KP1X{R?afRF`T4
zfl#2TJd$(ToJm4zWEsQF0d1yKn=D_-u8>*nok`ITJx9@lkDD@;=zyqjWlhfv;{wVY
znJ|pIh$j)5Y!}8oM;t;FDIqczU5V($fm9*h#Mw3>KK#otjv%JaK&4d3c_!dnDW7)3
zMJbn_gAqxh=V40n(H=<m_~;m{!MzvW$GsBv;a&#EJU+LI$NmAUk$~O#HMhYwkL!ru
z@YJS4N%{(S+pBV;Vsx)}U8*uFvZyy#3UQLy|MCLqhY?w#MbRnwH_A<WU~q9helI?|
zhZ`2*diG~14C`~YaWN5&=S&KT9#H)<M~I8q$w$%7C3P0M7kFj4Wwtg;Q3@@yB{B6Y
XrI7#kC(x^`=8L3ck3~^h@FVvRMn;PN

delta 1121
zcmZuxYfKbZ6ux(4fm!!4vyaZY26tx#siacZtr)emF1pFAQTzdjA;DLaK!`tRC_iki
zM!<BsY<QeTjjfNMM%1Xm1%ru7)TpshqtV1DO-rjyhSsJCbj7-KdhTwZk93lIzcb%C
z=R0T4y_v3>u9~*{{QMat`OI&B(k~|7O1(@WoTLMeQyGr);{)Nki<g$P9Qbi<?bhaF
zy|Mk=&l&s|MnaUR*=~f0F~06FPly(u(Dgp1qP?HVoQ3-sJ2=T!UN2MBpOnTI0=hbw
z%lW6StD!{Wj)eZP3CR{l?m{vWN~kxH*b7glm-t+aUWzhm==m>2NUvsu5#y9dXjq9Z
zEQex~k3NDrlf%0ReHhY*9ca@rM^QuLO5=`klB^)}aNIP9o5{mnQ#O~*!>B2bj=(Il
zOdrBBvqUe$I&*+FK?^cl;jH;nPe(>l@Fjv)_2$2V&me5c!`ymHlUTt**07LNTbqEl
z2GCb%m1z%bux_UZ;i)y3?g387rFD=e_{7cWnDgfKRL&Nt6asW7v<tF(qX8?cw^AdG
zj!(sqbhsld;6y`*=*8w`QKDbNVlhCE!ZuOH=3B*Lx)8n-C3jZZKO|PZN=j%rF+&<y
zZMAe0d}0gWe$FP-B6whvXaa_i8HFsnj0649F428ZZV%9Ah#*r1XY7TBLHxc!_|5J%
zXlQ9*akzI5E0Ho>s~Iz>sQ0jMtpZ1J#f$f$pR!BQ{X3RtrxC%0?h<x7$>>{Ji1|>9
z@rzUTFtg{S>}0%*cH8aiRryv=6Y3FS^(-U7^5ELA`ZzaO7A##A&1uN=k}@Sak6}qr
zod~P(Rdd;$%T%sTOw-C^ha5||l`BScy$1!hjOzNgi1mm}^0P5rA45Ei=)j&|BEE<C
zYh2e$5f9-R)FWQ_L)X7Ve3Ss6RKRH?P$A{h&q0-P=`QG&B)S`JOCH(^L%8<>@AA-g
zn2Wm)!nnJk#^tfQa6H$r8VOp2J=}70I(Iqtm8&uh-p*1uhcot3)(2^Rhm%G8`<X@r
z;{9J<BnkLImS}bCwfsHh-kAYUXXoRY^4a~I;Dm3o8&DXEa@KQRCv@h-#bkX{zrhh=
yBNlQbc5==JBkcs<|E_VeHcRmr7$-|&>TZ7l|M!pLs(%q*Ev0&_j?o1txW51rWtZ{*