From 0ae67f02a60ec57af8cd31728986618fcac4470a Mon Sep 17 00:00:00 2001 From: garciay Date: Fri, 21 Feb 2020 11:06:35 +0100 Subject: [PATCH] Update ITS tools --- .../com_spirent_its_security.vcxproj | 161 ------------------ .../com_spirent_its_security.vcxproj.user | 4 - .../com_spirent_its_security_NativeSecurity.c | 67 -------- .../com_spirent_its_security_NativeSecurity.h | 29 ---- .../com/spirent/its/security/JniTest.class | Bin 871 -> 0 bytes .../com/spirent/its/security/JniTest.java | 20 --- .../spirent/its/security/NativeSecurity.class | Bin 502 -> 0 bytes .../spirent/its/security/NativeSecurity.java | 14 -- tools/itssecurity/javasrc/hello.jar | Bin 1568 -> 0 bytes 9 files changed, 295 deletions(-) delete mode 100644 tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj delete mode 100644 tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj.user delete mode 100644 tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.c delete mode 100644 tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.h delete mode 100644 tools/itssecurity/javasrc/com/spirent/its/security/JniTest.class delete mode 100644 tools/itssecurity/javasrc/com/spirent/its/security/JniTest.java delete mode 100644 tools/itssecurity/javasrc/com/spirent/its/security/NativeSecurity.class delete mode 100644 tools/itssecurity/javasrc/com/spirent/its/security/NativeSecurity.java delete mode 100644 tools/itssecurity/javasrc/hello.jar diff --git a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj b/tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj deleted file mode 100644 index 3c493b33d..000000000 --- a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj +++ /dev/null @@ -1,161 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {A5E5C89A-7B89-443A-9972-E0145DBA3B7E} - Win32Proj - comspirentitssecurity - 10.0 - - - - StaticLibrary - true - v142 - Unicode - - - StaticLibrary - false - v142 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - false - - - true - - - true - - - false - - - - NotUsing - Level3 - true - true - true - _Win64;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - C:\Program Files\OpenSSL-Win64\include;C:\Program Files\Java\jdk1.8.0_241\include;C:\Program Files\Java\jdk1.8.0_241\include\win32;$(ProjectDir)../lib_its_security;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - lib_its_security.lib;libcrypto64MDd.lib;libssl64MDd.lib;Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(ProjectDir)..\x64\Release;C:\Program Files\OpenSSL-Win64\lib\VC;C:\Program Files\Java\jre1.8.0_241\bin - - - - - Use - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - - - - - Use - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - - - - - Use - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj.user b/tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj.user deleted file mode 100644 index 88a550947..000000000 --- a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.c b/tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.c deleted file mode 100644 index dc4bcd53b..000000000 --- a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.c +++ /dev/null @@ -1,67 +0,0 @@ -/* system headers */ -#include -#include -#include -#include -//add whatever is needed -#include -#include "com_spirent_its_security_NativeSecurity.h" - -#include "lib_its_security.h" - -//if you use other memory allocation function, please inform me! -#ifdef WIN32 -DLLAPI void* _tt_calloc(size_t, size_t); -#define calloc(NUM, SIZE) _tt_calloc(NUM, SIZE) -DLLAPI void _tt_free(void*); -#define free(PTR) _tt_free(PTR) -#else -#endif //WIN32 - -#ifdef WIN32 -void* _tt_calloc(size_t num, size_t elemSize) { -#if (_MSC_VER >= 1700) // newer than Visual Studio 2012 - size_t size = num * elemSize; - void* res = CoTaskMemAlloc(size); - memset(res, 0, size); - return res; -#else - return HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, (num) * (elemSize)); -#endif -} - -void _tt_free(void* ptr) { -#if (_MSC_VER >= 1700) // newer than Visual Studio 2012 - CoTaskMemFree(ptr); -#else - HeapFree(GetProcessHeap(), 0, ptr); -#endif -} -#endif //WIN32 - -/* - * Class: com_spirent_its_security_NativeSecurity - * Method: hashWithSha256 - * Signature: ([B)[B - */ -JNIEXPORT jbyteArray JNICALL Java_com_spirent_its_security_NativeSecurity_hashWithSha256(JNIEnv* env, jobject jobj, jbyteArray p_toBeHashedData) { - jbyteArray java_hashed_data; - int32_t result; - - // Extract buffers - size_t to_be_hashed_data_length = (*env)->GetArrayLength(env, p_toBeHashedData); - uint8_t* to_be_hashed_data = (uint8_t*)calloc(sizeof(uint8_t), to_be_hashed_data_length); - (*env)->GetByteArrayRegion(env, p_toBeHashedData, 0, (jsize)to_be_hashed_data_length, (jbyte*)to_be_hashed_data); - // Call lib_its_security implementation - uint8_t* hashed_data = NULL; - result = hash_with_sha256(to_be_hashed_data, to_be_hashed_data_length, &hashed_data); - // Prepare return value - java_hashed_data = (*env)->NewByteArray(env, (jsize)to_be_hashed_data_length); - if (result == 0) { - (*env)->SetByteArrayRegion(env, java_hashed_data, 0, (jsize)to_be_hashed_data_length, (jbyte*)hashed_data); - } - // Free allocated resources - free(hashed_data); - - return java_hashed_data; -} diff --git a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.h b/tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.h deleted file mode 100644 index ec5155d3e..000000000 --- a/tools/itssecurity/com_spirent_its_security/com_spirent_its_security_NativeSecurity.h +++ /dev/null @@ -1,29 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include -/* Header for class com_spirent_its_security_NativeSecurity */ - -#ifndef _Included_com_spirent_its_security -#define _Included_com_spirent_its_security -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: com_spirent_its_security_NativeSecurity - * Method: hashWithSha256 - * Signature: ([B)[B - */ -JNIEXPORT jbyteArray JNICALL Java_com_spirent_its_security_NativeSecurity_hashWithSha256 - (JNIEnv *, jobject, jbyteArray); - -/* - * Class: com_spirent_its_security_NativeSecurity - * Method: hmac_sha256 - * Signature: ([B[B)[B - */ -JNIEXPORT jbyteArray JNICALL Java_com_spirent_its_security_NativeSecurity_hmac_1sha256 - (JNIEnv *, jobject, jbyteArray, jbyteArray); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/tools/itssecurity/javasrc/com/spirent/its/security/JniTest.class b/tools/itssecurity/javasrc/com/spirent/its/security/JniTest.class deleted file mode 100644 index a573bf32610129a8fff20b3d6d038e05c2d9df49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 871 zcma)4T~E|N6g{(FE!_g^BKQTk;s;$=sUjZ_5H*+(H4B<_BiZmkX1f!1u-lS$mV{UT zjL-6b#28;q_!0gSiFfKMA<=}Uow>bp?z!il_Vnz_HvkJ*wlIhr1GtG>CdMsHVA8^E zRP=I3r>9KZHF3|xeT&{67??KTFcem0DAiMjtW$l*kb4oe1;cP%hGMhVZHc(STLEQq zT`oh0F=xBJ#}Bw0@Nn1lR4l{Y6N7wb|}*{?&{ z5Q&=8L^g&nY+%O5ENXQ2QUpO%t87Ja&^GYU#vEJ&k8C`~yp1PVu(7Ctg>_D3Z3e^Z z`M%K6xF2?FeP#Zn#4wS&OM5?qD~Vcb5(C5-zAU!J2N7@A zWh>_KAu6!x_tICE9{OS+KPZ}@ozb43`3&}n0){KJ7Sd!E11MvJVh#O(Tw4762$^#B z7&+ss+02$s8_itltkKMuel(f|daa)zKYNVAM(sO>j$o8c!hS?imkm&;yJXTXlQ1YQ z!X$AOlIM`H8cAEG(`VH8DxKQM{KT?>(eySk_E-8;s*$votrHZ_wOholC&&{!!?m>A F^f=Hv z=m+$pqO&4GUe#R8nRDj6&pUIzzTZCq9AU$OiIR;JRxPYK97`6~3HH4TV=Y2o5-JUU zIPl^}70FP0O2=L-{ZXX!lh+hljb&?=o)R)O6)Js3NR=x$g!K9FfeD3%3T1ON=*Z|= zboyM$2O6bS)G7h zrj0J|nQ74?LJmuu+sLCZlWa}z81xF`c|qYax;TgLvQ@I&52WrUNWZ~Yv@jXA%q<31 FegJ9cYNP-F diff --git a/tools/itssecurity/javasrc/com/spirent/its/security/NativeSecurity.java b/tools/itssecurity/javasrc/com/spirent/its/security/NativeSecurity.java deleted file mode 100644 index 54da390ef..000000000 --- a/tools/itssecurity/javasrc/com/spirent/its/security/NativeSecurity.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.spirent.its.security;; - -class NativeSecurity -{ - private static final NativeSecurity _instance = new NativeSecurity(); - - private NativeSecurity() { }; - - public native byte[] hashWithSha256(byte[] p_toBeHashedData); - - public static NativeSecurity getInstance() { return _instance; }; - -} - diff --git a/tools/itssecurity/javasrc/hello.jar b/tools/itssecurity/javasrc/hello.jar deleted file mode 100644 index 88eff170ae882758a338dd753f20ce81edae48a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1568 zcmWIWW@Zs#;Nak3$PWq)U_b(#3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5`TA zUPvC1o++V~@k3ly?fDWdi|68^PsCNHFK7Me7NzEu=x3G`>lddcmlkD~RO)->Wrm~{m*^$uBo-I<21WZ{aS-{Jmalu4 z>9tY?bIeC4@vv1Vo-!_C6JC_&I5|&6TJA(n`60ft=u77&eRwthW2D>!iN~us?GM!} zee{V{Rhw~Pi}CYMbBp)=T(&$tejj7RflaNBcO(w@-Z3)FOJtfXmbZA(bZaY{)JN+& ztJU5`Ke071$UTs#vF233s^vV9%YXGLepkxkZhN?k=V;pc+d_rS+nKta?22jQNj_Ir z+b>^W{@~%d*DE91c5Ck{xDb4&e*eMm!Fw9Dns>fp|NCs3_}8TPHQskm)ybY}^SCl6 zFD04dFk4#AnMH0prz>$Rib~b)YTnk^ZuabfR7J{T!)LiR2b+3bd3DwlXI)D(*fZ}v zcW&?Rz;gAQ(>HQl?F%{Sr}QUI=jy{4YmOY9gQ+V7j=fEeIkcnRAaA~i^UFUq`BBw} zmItI&zn#CMe1^tF)w7G_Qr+vdm6X5ho?Pf5a&WgckFt16=lgx%m@XAv*%@)_<^Q5P zPrT$f*1tCrDQ~S3RqJZEdujDLtb<7MDGgS;BS&=_j*N2&zv7&W-x1?+OdB@^SvyEu5T)BdSqGN zz3a8`lan!U(2ykP07*<`PDN)D?E?m<>!aY)*@0`Q_fyopu9Ny;!ESn z{4O$gv}Ct16;{+7I#jefF7rBPUihoimEY=q+P}Ox>;C+w)@vVXe0tjIb;)bLIe%4> zPSJ@&=MT|wuJ+5?oxT&--Z{O*_lg0KEcFk7!%a&|-=*g}# z83|9>LDAuurn%mPk%8eG5C?cOGKnytmT$1a3sk