From 234bd58643e83aa7d34d752de3e98d6ae84cba3d Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 3 Apr 2019 21:24:36 +0200 Subject: Bug 1369: SCC: Hide SHA Algorithm bit size in literals of Specification Implementation currently uses 256 bit Secure Hash (SHA) algorithm, but this may change in the future. Hence only use 'SHA' in the names, not 'SHA256'. --- make/Manifest | 10 ++-- make/Manifest-android-launcher | 10 ++-- make/Manifest-rt | 10 ++-- make/Manifest-rt-alt | 10 ++-- make/Manifest-rt-android | 10 ++-- make/Manifest-rt-natives | 10 ++-- make/Manifest-rt.cdc | 10 ++-- make/build.xml | 106 ++++++++++++++++++++--------------------- make/scripts/runtest.sh | 4 +- 9 files changed, 90 insertions(+), 90 deletions(-) (limited to 'make') diff --git a/make/Manifest b/make/Manifest index 27a9acc..b232e48 100755 --- a/make/Manifest +++ b/make/Manifest @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/Manifest-android-launcher b/make/Manifest-android-launcher index 4754474..02f21ec 100755 --- a/make/Manifest-android-launcher +++ b/make/Manifest-android-launcher @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/Manifest-rt b/make/Manifest-rt index 98f0e3f..22b8b06 100755 --- a/make/Manifest-rt +++ b/make/Manifest-rt @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/Manifest-rt-alt b/make/Manifest-rt-alt index f577950..6474c93 100755 --- a/make/Manifest-rt-alt +++ b/make/Manifest-rt-alt @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/Manifest-rt-android b/make/Manifest-rt-android index 16350df..d7058ee 100755 --- a/make/Manifest-rt-android +++ b/make/Manifest-rt-android @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/Manifest-rt-natives b/make/Manifest-rt-natives index 480f765..2767462 100755 --- a/make/Manifest-rt-natives +++ b/make/Manifest-rt-natives @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc index 93a62ae..a23c48f 100755 --- a/make/Manifest-rt.cdc +++ b/make/Manifest-rt.cdc @@ -8,11 +8,11 @@ Implementation-Version: @VERSION@ Implementation-Build: @BUILD_VERSION@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ -Implementation-SHA256-Sources: @SHA256_SOURCES@ -Implementation-SHA256-Classes: @SHA256_CLASSES@ -Implementation-SHA256-Classes-this: @SHA256_CLASSES_THIS@ -Implementation-SHA256-Natives: @SHA256_NATIVES@ -Implementation-SHA256-Natives-this: @SHA256_NATIVES_THIS@ +Implementation-SHA-Sources: @SHA_SOURCES@ +Implementation-SHA-Classes: @SHA_CLASSES@ +Implementation-SHA-Classes-this: @SHA_CLASSES_THIS@ +Implementation-SHA-Natives: @SHA_NATIVES@ +Implementation-SHA-Natives-this: @SHA_NATIVES_THIS@ Implementation-Vendor: JogAmp Community Implementation-Vendor-Id: com.jogamp Implementation-URL: http://jogamp.org/ diff --git a/make/build.xml b/make/build.xml index 61a3880..5df5446 100644 --- a/make/build.xml +++ b/make/build.xml @@ -520,11 +520,11 @@ - - - - - + + + + + @@ -799,7 +799,7 @@ + outputproperty="gluegen.build.sha.classes.gluegen"> @@ -818,11 +818,11 @@ - - - - - + + + + + @@ -844,7 +844,7 @@ + outputproperty="gluegen.build.sha.classes.gluegen-rt"> @@ -871,11 +871,11 @@ - - - - - + + + + + @@ -904,11 +904,11 @@ - - - - - + + + + + @@ -936,11 +936,11 @@ - - - - - + + + + + @@ -954,11 +954,11 @@ - - - - - + + + + + @@ -1002,7 +1002,7 @@ + outputproperty="gluegen.build.sha.classes.gluegen-rt-android"> @@ -1027,11 +1027,11 @@ - - - - - + + + + + @@ -1063,7 +1063,7 @@ + outputproperty="gluegen.build.sha.sources"> @@ -1079,19 +1079,19 @@ + outputproperty="gluegen.build.sha.classes"> + outputproperty="gluegen.build.sha.natives"> - - - + + + @@ -1125,7 +1125,7 @@ + outputproperty="gluegen.build.sha.classes.jogamp-android-launcher"> @@ -1141,11 +1141,11 @@ - - - - - + + + + + @@ -1219,9 +1219,9 @@ - - - + + + diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 6b14fdc..0ce33bd 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -93,7 +93,7 @@ function onetest() { # #onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG -#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG +onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG @@ -112,7 +112,7 @@ function onetest() { #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSyncRingBuffer01 $* -- cgit v1.2.3