mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-26 16:20:03 +02:00
Merge branch 'naming' into framescaught
This commit is contained in:
commit
c1d1edee89
@ -96,6 +96,20 @@ target_compile_options(slsProjectWarnings INTERFACE
|
|||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
#Settings for C code
|
||||||
|
add_library(slsProjectCSettings INTERFACE)
|
||||||
|
target_compile_features(slsProjectCSettings INTERFACE c_std_99)
|
||||||
|
target_compile_options(slsProjectCSettings INTERFACE
|
||||||
|
-Wall
|
||||||
|
-Wextra
|
||||||
|
-Wno-unused-parameter
|
||||||
|
-Wdouble-promotion
|
||||||
|
-Wformat=2
|
||||||
|
-Wredundant-decls
|
||||||
|
-Wdouble-promotion
|
||||||
|
-Werror=return-type
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
#Testing for minimum version for compilers
|
#Testing for minimum version for compilers
|
||||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||||
|
|||||||
@ -1,17 +1,5 @@
|
|||||||
|
|
||||||
add_library(slsProjectCSettings INTERFACE)
|
|
||||||
target_compile_features(slsProjectCSettings INTERFACE c_std_99)
|
|
||||||
target_compile_options(slsProjectCSettings INTERFACE
|
|
||||||
-Wall
|
|
||||||
-Wextra
|
|
||||||
-Wno-unused-parameter #Needs to be slowly mitigated
|
|
||||||
-Wdouble-promotion
|
|
||||||
-Wformat=2
|
|
||||||
-Wredundant-decls
|
|
||||||
# -Wconversion
|
|
||||||
-Wdouble-promotion
|
|
||||||
-Werror=return-type
|
|
||||||
)
|
|
||||||
|
|
||||||
# Install fake the library
|
# Install fake the library
|
||||||
install(TARGETS slsProjectCSettings
|
install(TARGETS slsProjectCSettings
|
||||||
|
|||||||
@ -18,14 +18,13 @@ add_executable(ctbDetectorServer_virtual
|
|||||||
../slsDetectorServer/src/programFpgaBlackfin.c
|
../slsDetectorServer/src/programFpgaBlackfin.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../slsDetectorServer/src/loadPattern.c
|
../slsDetectorServer/src/loadPattern.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsDetectorSoftware/include/sls/
|
../../slsDetectorSoftware/include/sls/
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(ctbDetectorServer_virtual
|
target_include_directories(ctbDetectorServer_virtual
|
||||||
|
|||||||
@ -3,11 +3,11 @@ main_inc = ../slsDetectorServer/include/
|
|||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
det_lib = ../../slsDetectorSoftware/include/sls/
|
det_lib = ../../slsDetectorSoftware/include/sls/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
CROSS = bfin-uclinux-
|
CROSS = bfin-uclinux-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DCHIPTESTBOARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) -I$(md5_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DCHIPTESTBOARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = ctbDetectorServer
|
PROGS = ctbDetectorServer
|
||||||
DESTDIR ?= bin
|
DESTDIR ?= bin
|
||||||
|
|||||||
Binary file not shown.
@ -6,13 +6,12 @@ set(src
|
|||||||
../slsDetectorServer/src/communication_funcs_UDP.c
|
../slsDetectorServer/src/communication_funcs_UDP.c
|
||||||
../slsDetectorServer/src/common.c
|
../slsDetectorServer/src/common.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(eigerDetectorServerMaster_virtual
|
add_executable(eigerDetectorServerMaster_virtual
|
||||||
|
|||||||
@ -2,12 +2,12 @@ current_dir = $(shell pwd)
|
|||||||
main_inc = ../slsDetectorServer/include/
|
main_inc = ../slsDetectorServer/include/
|
||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
BLACKFIN_CC = bfin-uclinux-gcc
|
BLACKFIN_CC = bfin-uclinux-gcc
|
||||||
CROSS = powerpc-4xx-softfloat-
|
CROSS = powerpc-4xx-softfloat-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DEIGERD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir)#-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DEIGERD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = eigerDetectorServer
|
PROGS = eigerDetectorServer
|
||||||
DESTDIR = bin
|
DESTDIR = bin
|
||||||
|
|||||||
Binary file not shown.
@ -12,13 +12,12 @@ add_executable(gotthard2DetectorServer_virtual
|
|||||||
../slsDetectorServer/src/ASIC_Driver.c
|
../slsDetectorServer/src/ASIC_Driver.c
|
||||||
../slsDetectorServer/src/programFpgaNios.c
|
../slsDetectorServer/src/programFpgaNios.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(gotthard2DetectorServer_virtual
|
target_include_directories(gotthard2DetectorServer_virtual
|
||||||
|
|||||||
@ -2,11 +2,11 @@ current_dir = $(shell pwd)
|
|||||||
main_inc = ../slsDetectorServer/include/
|
main_inc = ../slsDetectorServer/include/
|
||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
CROSS = nios2-buildroot-linux-gnu-
|
CROSS = nios2-buildroot-linux-gnu-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DGOTTHARD2D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DGOTTHARD2D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = gotthard2DetectorServer
|
PROGS = gotthard2DetectorServer
|
||||||
DESTDIR ?= bin
|
DESTDIR ?= bin
|
||||||
|
|||||||
Binary file not shown.
@ -11,13 +11,12 @@ add_executable(gotthardDetectorServer_virtual
|
|||||||
../slsDetectorServer/src/commonServerFunctions.c
|
../slsDetectorServer/src/commonServerFunctions.c
|
||||||
../slsDetectorServer/src/communication_funcs_UDP.c
|
../slsDetectorServer/src/communication_funcs_UDP.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(gotthardDetectorServer_virtual
|
target_include_directories(gotthardDetectorServer_virtual
|
||||||
|
|||||||
@ -2,11 +2,11 @@ current_dir = $(shell pwd)
|
|||||||
main_inc = ../slsDetectorServer/include/
|
main_inc = ../slsDetectorServer/include/
|
||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
CROSS = bfin-uclinux-
|
CROSS = bfin-uclinux-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DGOTTHARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir) #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DGOTTHARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = gotthardDetectorServer
|
PROGS = gotthardDetectorServer
|
||||||
DESTDIR ?= bin
|
DESTDIR ?= bin
|
||||||
|
|||||||
Binary file not shown.
@ -13,14 +13,13 @@ add_executable(jungfrauDetectorServer_virtual
|
|||||||
../slsDetectorServer/src/programFpgaBlackfin.c
|
../slsDetectorServer/src/programFpgaBlackfin.c
|
||||||
../slsDetectorServer/src/communication_funcs_UDP.c
|
../slsDetectorServer/src/communication_funcs_UDP.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(jungfrauDetectorServer_virtual
|
target_include_directories(jungfrauDetectorServer_virtual
|
||||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_compile_definitions(jungfrauDetectorServer_virtual
|
target_compile_definitions(jungfrauDetectorServer_virtual
|
||||||
|
|||||||
@ -2,11 +2,11 @@ current_dir = $(shell pwd)
|
|||||||
main_inc = ../slsDetectorServer/include/
|
main_inc = ../slsDetectorServer/include/
|
||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
CROSS = bfin-uclinux-
|
CROSS = bfin-uclinux-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DJUNGFRAUD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir) #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DJUNGFRAUD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = jungfrauDetectorServer
|
PROGS = jungfrauDetectorServer
|
||||||
DESTDIR ?= bin
|
DESTDIR ?= bin
|
||||||
|
|||||||
Binary file not shown.
@ -15,14 +15,13 @@ add_executable(moenchDetectorServer_virtual
|
|||||||
../slsDetectorServer/src/programFpgaBlackfin.c
|
../slsDetectorServer/src/programFpgaBlackfin.c
|
||||||
../slsDetectorServer/src/loadPattern.c
|
../slsDetectorServer/src/loadPattern.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsDetectorSoftware/include/sls/
|
../../slsDetectorSoftware/include/sls/
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(moenchDetectorServer_virtual
|
target_include_directories(moenchDetectorServer_virtual
|
||||||
|
|||||||
@ -3,11 +3,11 @@ main_inc = ../slsDetectorServer/include/
|
|||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
det_lib = ../../slsDetectorSoftware/include/sls/
|
det_lib = ../../slsDetectorSoftware/include/sls/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
CROSS = bfin-uclinux-
|
CROSS = bfin-uclinux-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DMOENCHD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) -I$(md5_dir) #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DMOENCHD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = moenchDetectorServer
|
PROGS = moenchDetectorServer
|
||||||
DESTDIR ?= bin
|
DESTDIR ?= bin
|
||||||
|
|||||||
Binary file not shown.
@ -13,14 +13,13 @@ add_executable(mythen3DetectorServer_virtual
|
|||||||
../slsDetectorServer/src/programFpgaNios.c
|
../slsDetectorServer/src/programFpgaNios.c
|
||||||
../slsDetectorServer/src/loadPattern.c
|
../slsDetectorServer/src/loadPattern.c
|
||||||
../slsDetectorServer/src/sharedMemory.c
|
../slsDetectorServer/src/sharedMemory.c
|
||||||
../../slsSupportLib/opensslMd5/md5.c
|
../../slsSupportLib/src/md5.c
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../slsDetectorServer/include
|
../slsDetectorServer/include
|
||||||
../../slsSupportLib/include
|
../../slsSupportLib/include
|
||||||
../../slsDetectorSoftware/include/sls/
|
../../slsDetectorSoftware/include/sls/
|
||||||
../../slsSupportLib/opensslMd5
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(mythen3DetectorServer_virtual
|
target_include_directories(mythen3DetectorServer_virtual
|
||||||
|
|||||||
@ -3,11 +3,11 @@ main_inc = ../slsDetectorServer/include/
|
|||||||
main_src = ../slsDetectorServer/src/
|
main_src = ../slsDetectorServer/src/
|
||||||
support_lib = ../../slsSupportLib/include/
|
support_lib = ../../slsSupportLib/include/
|
||||||
det_lib = ../../slsDetectorSoftware/include/sls/
|
det_lib = ../../slsDetectorSoftware/include/sls/
|
||||||
md5_dir = ../../slsSupportLib/opensslMd5/
|
md5_dir = ../../slsSupportLib/src/
|
||||||
|
|
||||||
CROSS = nios2-buildroot-linux-gnu-
|
CROSS = nios2-buildroot-linux-gnu-
|
||||||
CC = $(CROSS)gcc
|
CC = $(CROSS)gcc
|
||||||
CFLAGS += -Wall -std=gnu99 -DMYTHEN3D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) -I$(md5_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
CFLAGS += -Wall -std=gnu99 -DMYTHEN3D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
|
||||||
LDLIBS += -lm -lrt -pthread
|
LDLIBS += -lm -lrt -pthread
|
||||||
PROGS = mythen3DetectorServer
|
PROGS = mythen3DetectorServer
|
||||||
DESTDIR ?= bin
|
DESTDIR ?= bin
|
||||||
|
|||||||
Binary file not shown.
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "md5.h"
|
#include "sls/md5.h"
|
||||||
#include <stdint.h> // int64_t
|
#include <stdint.h> // int64_t
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|||||||
@ -184,13 +184,13 @@ int verifyChecksumFromBuffer(char *mess, char *clientChecksum, char *buffer,
|
|||||||
ssize_t bytes) {
|
ssize_t bytes) {
|
||||||
LOG(logINFO, ("\tVerifying Checksum...\n"));
|
LOG(logINFO, ("\tVerifying Checksum...\n"));
|
||||||
MD5_CTX c;
|
MD5_CTX c;
|
||||||
if (!MD5_Init(&c)) {
|
if (!MD5_Init_SLS(&c)) {
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Init)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Init_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
if (!MD5_Update(&c, buffer, bytes)) {
|
if (!MD5_Update_SLS(&c, buffer, bytes)) {
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Update)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Update_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
@ -209,9 +209,9 @@ int verifyChecksumFromFile(char *mess, char *clientChecksum, char *fname) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
MD5_CTX c;
|
MD5_CTX c;
|
||||||
if (!MD5_Init(&c)) {
|
if (!MD5_Init_SLS(&c)) {
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Init)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Init_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
@ -220,9 +220,9 @@ int verifyChecksumFromFile(char *mess, char *clientChecksum, char *fname) {
|
|||||||
ssize_t bytes = fread(buf, 1, readUnitSize, fp);
|
ssize_t bytes = fread(buf, 1, readUnitSize, fp);
|
||||||
ssize_t totalBytesRead = bytes;
|
ssize_t totalBytesRead = bytes;
|
||||||
while (bytes > 0) {
|
while (bytes > 0) {
|
||||||
if (!MD5_Update(&c, buf, bytes)) {
|
if (!MD5_Update_SLS(&c, buf, bytes)) {
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Update)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Update_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
@ -247,9 +247,9 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
|
|||||||
}
|
}
|
||||||
|
|
||||||
MD5_CTX c;
|
MD5_CTX c;
|
||||||
if (!MD5_Init(&c)) {
|
if (!MD5_Init_SLS(&c)) {
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Init)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Init_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
@ -267,9 +267,9 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
|
|||||||
oldProgress = progress;
|
oldProgress = progress;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!MD5_Update(&c, buf, bytes)) {
|
if (!MD5_Update_SLS(&c, buf, bytes)) {
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Update)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Update_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
@ -293,8 +293,8 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
|
|||||||
|
|
||||||
int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c, char *msg) {
|
int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c, char *msg) {
|
||||||
unsigned char out[MD5_DIGEST_LENGTH];
|
unsigned char out[MD5_DIGEST_LENGTH];
|
||||||
if (!MD5_Final(out, c)) {
|
if (!MD5_Final_SLS(out, c)) {
|
||||||
strcpy(mess, "Unable to calculate checksum (MD5_Final)\n");
|
strcpy(mess, "Unable to calculate checksum (MD5_Final_SLS)\n");
|
||||||
LOG(logERROR, (mess));
|
LOG(logERROR, (mess));
|
||||||
return FAIL;
|
return FAIL;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,6 @@ set(SOURCES
|
|||||||
src/CmdProxy.cpp
|
src/CmdProxy.cpp
|
||||||
src/CmdParser.cpp
|
src/CmdParser.cpp
|
||||||
src/Pattern.cpp
|
src/Pattern.cpp
|
||||||
../slsSupportLib/opensslMd5/md5.c
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(slsDetectorObject OBJECT
|
add_library(slsDetectorObject OBJECT
|
||||||
@ -14,7 +13,6 @@ add_library(slsDetectorObject OBJECT
|
|||||||
|
|
||||||
target_include_directories(slsDetectorObject PUBLIC
|
target_include_directories(slsDetectorObject PUBLIC
|
||||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||||
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../slsSupportLib/opensslMd5>"
|
|
||||||
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -36,7 +34,6 @@ set(PUBLICHEADERS
|
|||||||
include/sls/Detector.h
|
include/sls/Detector.h
|
||||||
include/sls/Result.h
|
include/sls/Result.h
|
||||||
include/sls/Pattern.h
|
include/sls/Pattern.h
|
||||||
../slsSupportLib/opensslMd5/md5.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
#Shared library
|
#Shared library
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
#include "Module.h"
|
#include "Module.h"
|
||||||
#include "SharedMemory.h"
|
#include "SharedMemory.h"
|
||||||
#include "md5.h"
|
|
||||||
#include "sls/ClientSocket.h"
|
#include "sls/ClientSocket.h"
|
||||||
#include "sls/ToString.h"
|
#include "sls/ToString.h"
|
||||||
#include "sls/bit_utils.h"
|
#include "sls/bit_utils.h"
|
||||||
#include "sls/container_utils.h"
|
#include "sls/container_utils.h"
|
||||||
#include "sls/file_utils.h"
|
#include "sls/file_utils.h"
|
||||||
|
#include "sls/md5_helper.h"
|
||||||
#include "sls/network_utils.h"
|
#include "sls/network_utils.h"
|
||||||
#include "sls/sls_detector_exceptions.h"
|
#include "sls/sls_detector_exceptions.h"
|
||||||
#include "sls/sls_detector_funcs.h"
|
#include "sls/sls_detector_funcs.h"
|
||||||
@ -3406,18 +3406,6 @@ sls_detector_module Module::readSettingsFile(const std::string &fname,
|
|||||||
return myMod;
|
return myMod;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Module::calculateChecksum(char *buffer, ssize_t bytes) {
|
|
||||||
MD5_CTX c;
|
|
||||||
MD5_Init(&c);
|
|
||||||
MD5_Update(&c, buffer, bytes);
|
|
||||||
unsigned char out[MD5_DIGEST_LENGTH];
|
|
||||||
MD5_Final(out, &c);
|
|
||||||
std::ostringstream oss;
|
|
||||||
for (int i = 0; i != MD5_DIGEST_LENGTH; ++i)
|
|
||||||
oss << std::hex << std::setw(2) << std::setfill('0') << +out[i];
|
|
||||||
return oss.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
|
void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
|
||||||
// send program from memory to detector
|
// send program from memory to detector
|
||||||
LOG(logINFO) << "Sending programming binary (from pof) to module "
|
LOG(logINFO) << "Sending programming binary (from pof) to module "
|
||||||
@ -3428,7 +3416,7 @@ void Module::programFPGAviaBlackfin(std::vector<char> buffer) {
|
|||||||
client.Send(filesize);
|
client.Send(filesize);
|
||||||
|
|
||||||
// checksum
|
// checksum
|
||||||
std::string checksum = calculateChecksum(buffer.data(), filesize);
|
std::string checksum = sls::md5_calculate_checksum(buffer.data(), filesize);
|
||||||
LOG(logDEBUG1) << "Checksum:" << checksum;
|
LOG(logDEBUG1) << "Checksum:" << checksum;
|
||||||
char cChecksum[MAX_STR_LENGTH];
|
char cChecksum[MAX_STR_LENGTH];
|
||||||
memset(cChecksum, 0, MAX_STR_LENGTH);
|
memset(cChecksum, 0, MAX_STR_LENGTH);
|
||||||
@ -3544,7 +3532,7 @@ void Module::programFPGAviaNios(std::vector<char> buffer) {
|
|||||||
client.Send(filesize);
|
client.Send(filesize);
|
||||||
|
|
||||||
// checksum
|
// checksum
|
||||||
std::string checksum = calculateChecksum(buffer.data(), filesize);
|
std::string checksum = sls::md5_calculate_checksum(buffer.data(), filesize);
|
||||||
LOG(logDEBUG1) << "Checksum:" << checksum;
|
LOG(logDEBUG1) << "Checksum:" << checksum;
|
||||||
char cChecksum[MAX_STR_LENGTH];
|
char cChecksum[MAX_STR_LENGTH];
|
||||||
memset(cChecksum, 0, MAX_STR_LENGTH);
|
memset(cChecksum, 0, MAX_STR_LENGTH);
|
||||||
|
|||||||
@ -743,7 +743,6 @@ class Module : public virtual slsDetectorDefs {
|
|||||||
std::string getTrimbitFilename(detectorSettings settings, int e_eV);
|
std::string getTrimbitFilename(detectorSettings settings, int e_eV);
|
||||||
sls_detector_module readSettingsFile(const std::string &fname,
|
sls_detector_module readSettingsFile(const std::string &fname,
|
||||||
bool trimbits = true);
|
bool trimbits = true);
|
||||||
std::string calculateChecksum(char *buffer, ssize_t bytes);
|
|
||||||
void programFPGAviaBlackfin(std::vector<char> buffer);
|
void programFPGAviaBlackfin(std::vector<char> buffer);
|
||||||
void programFPGAviaNios(std::vector<char> buffer);
|
void programFPGAviaNios(std::vector<char> buffer);
|
||||||
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@ set(SOURCES
|
|||||||
src/ZmqSocket.cpp
|
src/ZmqSocket.cpp
|
||||||
src/UdpRxSocket.cpp
|
src/UdpRxSocket.cpp
|
||||||
src/sls_detector_exceptions.cpp
|
src/sls_detector_exceptions.cpp
|
||||||
# src/sls_detector_defs.cpp
|
src/md5_helper.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
# Header files to install as a part of the library
|
# Header files to install as a part of the library
|
||||||
@ -44,9 +44,25 @@ if(SLS_DEVEL_HEADERS)
|
|||||||
include/sls/versionAPI.h
|
include/sls/versionAPI.h
|
||||||
include/sls/ZmqSocket.h
|
include/sls/ZmqSocket.h
|
||||||
include/sls/bit_utils.h
|
include/sls/bit_utils.h
|
||||||
|
include/sls/mdf5.h
|
||||||
|
include/sls/md5_helper.h
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
# Library for md5 c code that we are using (and potentially other c code)
|
||||||
|
# Maybe this should be broken out into it's own folder etc.
|
||||||
|
add_library(md5sls STATIC
|
||||||
|
src/md5.c
|
||||||
|
)
|
||||||
|
|
||||||
|
target_include_directories(md5sls
|
||||||
|
PUBLIC
|
||||||
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||||
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# Create an object library to avoid building the library twice
|
# Create an object library to avoid building the library twice
|
||||||
add_library(slsSupportObject OBJECT
|
add_library(slsSupportObject OBJECT
|
||||||
${SOURCES}
|
${SOURCES}
|
||||||
@ -66,6 +82,7 @@ target_link_libraries(slsSupportObject
|
|||||||
rapidjson
|
rapidjson
|
||||||
PRIVATE
|
PRIVATE
|
||||||
slsProjectWarnings
|
slsProjectWarnings
|
||||||
|
md5sls
|
||||||
)
|
)
|
||||||
|
|
||||||
if (SLS_USE_TESTS)
|
if (SLS_USE_TESTS)
|
||||||
@ -103,6 +120,9 @@ if((CMAKE_BUILD_TYPE STREQUAL "Release") AND SLS_LTO_AVAILABLE)
|
|||||||
set_property(TARGET ${SUPPORT_LIBRARY_TARGETS} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
set_property(TARGET ${SUPPORT_LIBRARY_TARGETS} PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
list(APPEND SUPPORT_LIBRARY_TARGETS md5sls)
|
||||||
|
|
||||||
install(TARGETS ${SUPPORT_LIBRARY_TARGETS}
|
install(TARGETS ${SUPPORT_LIBRARY_TARGETS}
|
||||||
EXPORT "${TARGETS_EXPORT_NAME}"
|
EXPORT "${TARGETS_EXPORT_NAME}"
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
|
/*
|
||||||
Apache License
|
Apache License
|
||||||
Version 2.0, January 2004
|
Version 2.0, January 2004
|
||||||
http://www.apache.org/licenses/
|
http://www.apache.org/licenses/
|
||||||
@ -200,3 +200,186 @@
|
|||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
||||||
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
|
* in the file LICENSE in the source distribution or at
|
||||||
|
* https://www.openssl.org/source/license.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Modifications 2021 Paul Scherrer Institut
|
||||||
|
* Removed most of the code that is not relevant for our scope.
|
||||||
|
* Snippets copied from md5_local.h or md32_common.h has been marked
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef HEADER_MD5_H
|
||||||
|
# define HEADER_MD5_H
|
||||||
|
|
||||||
|
# include <stddef.h>
|
||||||
|
|
||||||
|
|
||||||
|
# ifdef __cplusplus
|
||||||
|
/*
|
||||||
|
* Modifications 2021 Paul Scherrer Institut
|
||||||
|
* namespace sls added
|
||||||
|
*/
|
||||||
|
namespace sls {
|
||||||
|
extern "C" {
|
||||||
|
# endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
* ! MD5_LONG has to be at least 32 bits wide. !
|
||||||
|
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||||
|
*/
|
||||||
|
# define MD5_LONG unsigned int
|
||||||
|
# define MD5_CBLOCK 64
|
||||||
|
# define MD5_LBLOCK (MD5_CBLOCK/4)
|
||||||
|
# define MD5_DIGEST_LENGTH 16
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* Comment from md32_common.h
|
||||||
|
*/
|
||||||
|
/*-
|
||||||
|
* This is a generic 32 bit "collector" for message digest algorithms.
|
||||||
|
* Whenever needed it collects input character stream into chunks of
|
||||||
|
* 32 bit values and invokes a block function that performs actual hash
|
||||||
|
* calculations.
|
||||||
|
*
|
||||||
|
* Porting guide.
|
||||||
|
*
|
||||||
|
* Obligatory macros:
|
||||||
|
*
|
||||||
|
* DATA_ORDER_IS_BIG_ENDIAN or DATA_ORDER_IS_LITTLE_ENDIAN
|
||||||
|
* this macro defines byte order of input stream.
|
||||||
|
* HASH_CBLOCK
|
||||||
|
* size of a unit chunk HASH_BLOCK operates on.
|
||||||
|
* HASH_LONG
|
||||||
|
* has to be at least 32 bit wide.
|
||||||
|
* HASH_CTX
|
||||||
|
* context structure that at least contains following
|
||||||
|
* members:
|
||||||
|
* typedef struct {
|
||||||
|
* ...
|
||||||
|
* HASH_LONG Nl,Nh;
|
||||||
|
* either {
|
||||||
|
* HASH_LONG data[HASH_LBLOCK];
|
||||||
|
* unsigned char data[HASH_CBLOCK];
|
||||||
|
* };
|
||||||
|
* unsigned int num;
|
||||||
|
* ...
|
||||||
|
* } HASH_CTX;
|
||||||
|
* data[] vector is expected to be zeroed upon first call to
|
||||||
|
* HASH_UPDATE.
|
||||||
|
* HASH_UPDATE
|
||||||
|
* name of "Update" function, implemented here.
|
||||||
|
* HASH_TRANSFORM
|
||||||
|
* name of "Transform" function, implemented here.
|
||||||
|
* HASH_FINAL
|
||||||
|
* name of "Final" function, implemented here.
|
||||||
|
* HASH_BLOCK_DATA_ORDER
|
||||||
|
* name of "block" function capable of treating *unaligned* input
|
||||||
|
* message in original (data) byte order, implemented externally.
|
||||||
|
* HASH_MAKE_STRING
|
||||||
|
* macro converting context variables to an ASCII hash string.
|
||||||
|
*
|
||||||
|
* MD5 example:
|
||||||
|
*
|
||||||
|
* #define DATA_ORDER_IS_LITTLE_ENDIAN
|
||||||
|
*
|
||||||
|
* #define HASH_LONG MD5_LONG
|
||||||
|
* #define HASH_CTX MD5_CTX
|
||||||
|
* #define HASH_CBLOCK MD5_CBLOCK
|
||||||
|
* #define HASH_UPDATE MD5_Update_SLS
|
||||||
|
* #define HASH_TRANSFORM MD5_Transform
|
||||||
|
* #define HASH_FINAL MD5_Final_SLS
|
||||||
|
* #define HASH_BLOCK_DATA_ORDER md5_block_data_order
|
||||||
|
*/
|
||||||
|
# define MD32_REG_T int
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* Made default little endian if big endian not defined
|
||||||
|
*/
|
||||||
|
#ifndef DATA_ORDER_IS_BIG_ENDIAN
|
||||||
|
#define DATA_ORDER_IS_LITTLE_ENDIAN
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* Macros exported from md32_common.h
|
||||||
|
*/
|
||||||
|
#define HASH_LONG MD5_LONG
|
||||||
|
#define HASH_CTX MD5_CTX
|
||||||
|
#define HASH_CBLOCK MD5_CBLOCK
|
||||||
|
#define HASH_UPDATE MD5_Update_SLS
|
||||||
|
#define HASH_TRANSFORM MD5_Transform
|
||||||
|
#define HASH_FINAL MD5_Final_SLS
|
||||||
|
#define HASH_BLOCK_DATA_ORDER md5_block_data_order
|
||||||
|
#define HASH_MAKE_STRING(c,s) do { \
|
||||||
|
unsigned long ll; \
|
||||||
|
ll=(c)->A; (void)HOST_l2c(ll,(s)); \
|
||||||
|
ll=(c)->B; (void)HOST_l2c(ll,(s)); \
|
||||||
|
ll=(c)->C; (void)HOST_l2c(ll,(s)); \
|
||||||
|
ll=(c)->D; (void)HOST_l2c(ll,(s)); \
|
||||||
|
} while (0)
|
||||||
|
#define ROTATE(a,n) (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
|
||||||
|
#if defined(DATA_ORDER_IS_BIG_ENDIAN)
|
||||||
|
|
||||||
|
# define HOST_c2l(c,l) (l =(((unsigned long)(*((c)++)))<<24), \
|
||||||
|
l|=(((unsigned long)(*((c)++)))<<16), \
|
||||||
|
l|=(((unsigned long)(*((c)++)))<< 8), \
|
||||||
|
l|=(((unsigned long)(*((c)++))) ) )
|
||||||
|
# define HOST_l2c(l,c) (*((c)++)=(unsigned char)(((l)>>24)&0xff), \
|
||||||
|
*((c)++)=(unsigned char)(((l)>>16)&0xff), \
|
||||||
|
*((c)++)=(unsigned char)(((l)>> 8)&0xff), \
|
||||||
|
*((c)++)=(unsigned char)(((l) )&0xff), \
|
||||||
|
l)
|
||||||
|
|
||||||
|
#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
|
||||||
|
|
||||||
|
# define HOST_c2l(c,l) (l =(((unsigned long)(*((c)++))) ), \
|
||||||
|
l|=(((unsigned long)(*((c)++)))<< 8), \
|
||||||
|
l|=(((unsigned long)(*((c)++)))<<16), \
|
||||||
|
l|=(((unsigned long)(*((c)++)))<<24) )
|
||||||
|
# define HOST_l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
|
||||||
|
*((c)++)=(unsigned char)(((l)>> 8)&0xff), \
|
||||||
|
*((c)++)=(unsigned char)(((l)>>16)&0xff), \
|
||||||
|
*((c)++)=(unsigned char)(((l)>>24)&0xff), \
|
||||||
|
l)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct MD5state_st {
|
||||||
|
MD5_LONG A, B, C, D;
|
||||||
|
MD5_LONG Nl, Nh;
|
||||||
|
MD5_LONG data[MD5_LBLOCK];
|
||||||
|
unsigned int num;
|
||||||
|
} MD5_CTX;
|
||||||
|
|
||||||
|
int MD5_Init_SLS(MD5_CTX *c);
|
||||||
|
int MD5_Update_SLS(MD5_CTX *c, const void *data, size_t len);
|
||||||
|
int MD5_Final_SLS(unsigned char *md, MD5_CTX *c);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* from md32_common.h
|
||||||
|
*/
|
||||||
|
void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
|
||||||
|
# ifdef __cplusplus
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace sls
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
7
slsSupportLib/include/sls/md5_helper.h
Normal file
7
slsSupportLib/include/sls/md5_helper.h
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace sls {
|
||||||
|
std::string md5_calculate_checksum(char *buffer, ssize_t bytes);
|
||||||
|
} // namespace sls
|
||||||
@ -4,10 +4,10 @@
|
|||||||
#define APIRECEIVER 0x210831
|
#define APIRECEIVER 0x210831
|
||||||
#define APIGUI 0x210819
|
#define APIGUI 0x210819
|
||||||
|
|
||||||
#define APICTB 0x210914
|
#define APIEIGER 0x210916
|
||||||
#define APIGOTTHARD 0x210914
|
#define APICTB 0x210916
|
||||||
#define APIGOTTHARD2 0x210914
|
#define APIGOTTHARD 0x210916
|
||||||
#define APIMOENCH 0x210914
|
#define APIGOTTHARD2 0x210916
|
||||||
#define APIJUNGFRAU 0x210915
|
#define APIJUNGFRAU 0x210916
|
||||||
#define APIMYTHEN3 0x210915
|
#define APIMYTHEN3 0x210916
|
||||||
#define APIEIGER 0x210915
|
#define APIMOENCH 0x210916
|
||||||
|
|||||||
@ -1,304 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
|
||||||
* in the file LICENSE in the source distribution or at
|
|
||||||
* https://www.openssl.org/source/license.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* MD5 low level APIs are deprecated for public use, but still ok for
|
|
||||||
* internal use.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Modifications 2021 Paul Scherrer Institut
|
|
||||||
* Removed most of the code that is not relevant for our scope
|
|
||||||
* from md5_dgst.c and renamed to md5.c
|
|
||||||
* from md32_common.h and replaced their macros with their defines
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* Header included was md5_local.h
|
|
||||||
* and included string.h header
|
|
||||||
*/
|
|
||||||
#include <string.h>
|
|
||||||
#include "md5.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* Macros exported from md5_local.h
|
|
||||||
*/
|
|
||||||
#define F(b,c,d) ((((c) ^ (d)) & (b)) ^ (d))
|
|
||||||
#define G(b,c,d) ((((b) ^ (c)) & (d)) ^ (c))
|
|
||||||
#define H(b,c,d) ((b) ^ (c) ^ (d))
|
|
||||||
#define I(b,c,d) (((~(d)) | (b)) ^ (c))
|
|
||||||
|
|
||||||
#define R0(a,b,c,d,k,s,t) { \
|
|
||||||
a+=((k)+(t)+F((b),(c),(d))); \
|
|
||||||
a=ROTATE(a,s); \
|
|
||||||
a+=b; };
|
|
||||||
|
|
||||||
#define R1(a,b,c,d,k,s,t) { \
|
|
||||||
a+=((k)+(t)+G((b),(c),(d))); \
|
|
||||||
a=ROTATE(a,s); \
|
|
||||||
a+=b; };
|
|
||||||
|
|
||||||
#define R2(a,b,c,d,k,s,t) { \
|
|
||||||
a+=((k)+(t)+H((b),(c),(d))); \
|
|
||||||
a=ROTATE(a,s); \
|
|
||||||
a+=b; };
|
|
||||||
|
|
||||||
#define R3(a,b,c,d,k,s,t) { \
|
|
||||||
a+=((k)+(t)+I((b),(c),(d))); \
|
|
||||||
a=ROTATE(a,s); \
|
|
||||||
a+=b; };
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Implemented from RFC1321 The MD5 Message-Digest Algorithm
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define INIT_DATA_A (unsigned long)0x67452301L
|
|
||||||
#define INIT_DATA_B (unsigned long)0xefcdab89L
|
|
||||||
#define INIT_DATA_C (unsigned long)0x98badcfeL
|
|
||||||
#define INIT_DATA_D (unsigned long)0x10325476L
|
|
||||||
|
|
||||||
int MD5_Init(MD5_CTX *c)
|
|
||||||
{
|
|
||||||
memset(c, 0, sizeof(*c));
|
|
||||||
c->A = INIT_DATA_A;
|
|
||||||
c->B = INIT_DATA_B;
|
|
||||||
c->C = INIT_DATA_C;
|
|
||||||
c->D = INIT_DATA_D;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void md5_block_data_order(MD5_CTX *c, const void *data_, size_t num)
|
|
||||||
{
|
|
||||||
const unsigned char *data = data_;
|
|
||||||
register unsigned MD32_REG_T A, B, C, D, l;
|
|
||||||
/* See comment in crypto/sha/sha_local.h for details. */
|
|
||||||
unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
|
|
||||||
XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
|
|
||||||
# define X(i) XX##i
|
|
||||||
|
|
||||||
A = c->A;
|
|
||||||
B = c->B;
|
|
||||||
C = c->C;
|
|
||||||
D = c->D;
|
|
||||||
|
|
||||||
for (; num--;) {
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(0) = l;
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(1) = l;
|
|
||||||
/* Round 0 */
|
|
||||||
R0(A, B, C, D, X(0), 7, 0xd76aa478L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(2) = l;
|
|
||||||
R0(D, A, B, C, X(1), 12, 0xe8c7b756L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(3) = l;
|
|
||||||
R0(C, D, A, B, X(2), 17, 0x242070dbL);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(4) = l;
|
|
||||||
R0(B, C, D, A, X(3), 22, 0xc1bdceeeL);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(5) = l;
|
|
||||||
R0(A, B, C, D, X(4), 7, 0xf57c0fafL);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(6) = l;
|
|
||||||
R0(D, A, B, C, X(5), 12, 0x4787c62aL);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(7) = l;
|
|
||||||
R0(C, D, A, B, X(6), 17, 0xa8304613L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(8) = l;
|
|
||||||
R0(B, C, D, A, X(7), 22, 0xfd469501L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(9) = l;
|
|
||||||
R0(A, B, C, D, X(8), 7, 0x698098d8L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(10) = l;
|
|
||||||
R0(D, A, B, C, X(9), 12, 0x8b44f7afL);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(11) = l;
|
|
||||||
R0(C, D, A, B, X(10), 17, 0xffff5bb1L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(12) = l;
|
|
||||||
R0(B, C, D, A, X(11), 22, 0x895cd7beL);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(13) = l;
|
|
||||||
R0(A, B, C, D, X(12), 7, 0x6b901122L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(14) = l;
|
|
||||||
R0(D, A, B, C, X(13), 12, 0xfd987193L);
|
|
||||||
(void)HOST_c2l(data, l);
|
|
||||||
X(15) = l;
|
|
||||||
R0(C, D, A, B, X(14), 17, 0xa679438eL);
|
|
||||||
R0(B, C, D, A, X(15), 22, 0x49b40821L);
|
|
||||||
/* Round 1 */
|
|
||||||
R1(A, B, C, D, X(1), 5, 0xf61e2562L);
|
|
||||||
R1(D, A, B, C, X(6), 9, 0xc040b340L);
|
|
||||||
R1(C, D, A, B, X(11), 14, 0x265e5a51L);
|
|
||||||
R1(B, C, D, A, X(0), 20, 0xe9b6c7aaL);
|
|
||||||
R1(A, B, C, D, X(5), 5, 0xd62f105dL);
|
|
||||||
R1(D, A, B, C, X(10), 9, 0x02441453L);
|
|
||||||
R1(C, D, A, B, X(15), 14, 0xd8a1e681L);
|
|
||||||
R1(B, C, D, A, X(4), 20, 0xe7d3fbc8L);
|
|
||||||
R1(A, B, C, D, X(9), 5, 0x21e1cde6L);
|
|
||||||
R1(D, A, B, C, X(14), 9, 0xc33707d6L);
|
|
||||||
R1(C, D, A, B, X(3), 14, 0xf4d50d87L);
|
|
||||||
R1(B, C, D, A, X(8), 20, 0x455a14edL);
|
|
||||||
R1(A, B, C, D, X(13), 5, 0xa9e3e905L);
|
|
||||||
R1(D, A, B, C, X(2), 9, 0xfcefa3f8L);
|
|
||||||
R1(C, D, A, B, X(7), 14, 0x676f02d9L);
|
|
||||||
R1(B, C, D, A, X(12), 20, 0x8d2a4c8aL);
|
|
||||||
/* Round 2 */
|
|
||||||
R2(A, B, C, D, X(5), 4, 0xfffa3942L);
|
|
||||||
R2(D, A, B, C, X(8), 11, 0x8771f681L);
|
|
||||||
R2(C, D, A, B, X(11), 16, 0x6d9d6122L);
|
|
||||||
R2(B, C, D, A, X(14), 23, 0xfde5380cL);
|
|
||||||
R2(A, B, C, D, X(1), 4, 0xa4beea44L);
|
|
||||||
R2(D, A, B, C, X(4), 11, 0x4bdecfa9L);
|
|
||||||
R2(C, D, A, B, X(7), 16, 0xf6bb4b60L);
|
|
||||||
R2(B, C, D, A, X(10), 23, 0xbebfbc70L);
|
|
||||||
R2(A, B, C, D, X(13), 4, 0x289b7ec6L);
|
|
||||||
R2(D, A, B, C, X(0), 11, 0xeaa127faL);
|
|
||||||
R2(C, D, A, B, X(3), 16, 0xd4ef3085L);
|
|
||||||
R2(B, C, D, A, X(6), 23, 0x04881d05L);
|
|
||||||
R2(A, B, C, D, X(9), 4, 0xd9d4d039L);
|
|
||||||
R2(D, A, B, C, X(12), 11, 0xe6db99e5L);
|
|
||||||
R2(C, D, A, B, X(15), 16, 0x1fa27cf8L);
|
|
||||||
R2(B, C, D, A, X(2), 23, 0xc4ac5665L);
|
|
||||||
/* Round 3 */
|
|
||||||
R3(A, B, C, D, X(0), 6, 0xf4292244L);
|
|
||||||
R3(D, A, B, C, X(7), 10, 0x432aff97L);
|
|
||||||
R3(C, D, A, B, X(14), 15, 0xab9423a7L);
|
|
||||||
R3(B, C, D, A, X(5), 21, 0xfc93a039L);
|
|
||||||
R3(A, B, C, D, X(12), 6, 0x655b59c3L);
|
|
||||||
R3(D, A, B, C, X(3), 10, 0x8f0ccc92L);
|
|
||||||
R3(C, D, A, B, X(10), 15, 0xffeff47dL);
|
|
||||||
R3(B, C, D, A, X(1), 21, 0x85845dd1L);
|
|
||||||
R3(A, B, C, D, X(8), 6, 0x6fa87e4fL);
|
|
||||||
R3(D, A, B, C, X(15), 10, 0xfe2ce6e0L);
|
|
||||||
R3(C, D, A, B, X(6), 15, 0xa3014314L);
|
|
||||||
R3(B, C, D, A, X(13), 21, 0x4e0811a1L);
|
|
||||||
R3(A, B, C, D, X(4), 6, 0xf7537e82L);
|
|
||||||
R3(D, A, B, C, X(11), 10, 0xbd3af235L);
|
|
||||||
R3(C, D, A, B, X(2), 15, 0x2ad7d2bbL);
|
|
||||||
R3(B, C, D, A, X(9), 21, 0xeb86d391L);
|
|
||||||
|
|
||||||
A = c->A += A;
|
|
||||||
B = c->B += B;
|
|
||||||
C = c->C += C;
|
|
||||||
D = c->D += D;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* from md32_common.h
|
|
||||||
*/
|
|
||||||
int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
|
|
||||||
{
|
|
||||||
const unsigned char *data = data_;
|
|
||||||
unsigned char *p;
|
|
||||||
HASH_LONG l;
|
|
||||||
size_t n;
|
|
||||||
|
|
||||||
if (len == 0)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
l = (c->Nl + (((HASH_LONG) len) << 3)) & 0xffffffffUL;
|
|
||||||
if (l < c->Nl) /* overflow */
|
|
||||||
c->Nh++;
|
|
||||||
c->Nh += (HASH_LONG) (len >> 29); /* might cause compiler warning on
|
|
||||||
* 16-bit */
|
|
||||||
c->Nl = l;
|
|
||||||
|
|
||||||
n = c->num;
|
|
||||||
if (n != 0) {
|
|
||||||
p = (unsigned char *)c->data;
|
|
||||||
|
|
||||||
if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {
|
|
||||||
memcpy(p + n, data, HASH_CBLOCK - n);
|
|
||||||
HASH_BLOCK_DATA_ORDER(c, p, 1);
|
|
||||||
n = HASH_CBLOCK - n;
|
|
||||||
data += n;
|
|
||||||
len -= n;
|
|
||||||
c->num = 0;
|
|
||||||
/*
|
|
||||||
* We use memset rather than OPENSSL_cleanse() here deliberately.
|
|
||||||
* Using OPENSSL_cleanse() here could be a performance issue. It
|
|
||||||
* will get properly cleansed on finalisation so this isn't a
|
|
||||||
* security problem.
|
|
||||||
*/
|
|
||||||
memset(p, 0, HASH_CBLOCK); /* keep it zeroed */
|
|
||||||
} else {
|
|
||||||
memcpy(p + n, data, len);
|
|
||||||
c->num += (unsigned int)len;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
n = len / HASH_CBLOCK;
|
|
||||||
if (n > 0) {
|
|
||||||
HASH_BLOCK_DATA_ORDER(c, data, n);
|
|
||||||
n *= HASH_CBLOCK;
|
|
||||||
data += n;
|
|
||||||
len -= n;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (len != 0) {
|
|
||||||
p = (unsigned char *)c->data;
|
|
||||||
c->num = (unsigned int)len;
|
|
||||||
memcpy(p, data, len);
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* from md32_common.h
|
|
||||||
*/
|
|
||||||
int HASH_FINAL(unsigned char *md, HASH_CTX *c)
|
|
||||||
{
|
|
||||||
unsigned char *p = (unsigned char *)c->data;
|
|
||||||
size_t n = c->num;
|
|
||||||
|
|
||||||
p[n] = 0x80; /* there is always room for one */
|
|
||||||
n++;
|
|
||||||
|
|
||||||
if (n > (HASH_CBLOCK - 8)) {
|
|
||||||
memset(p + n, 0, HASH_CBLOCK - n);
|
|
||||||
n = 0;
|
|
||||||
HASH_BLOCK_DATA_ORDER(c, p, 1);
|
|
||||||
}
|
|
||||||
memset(p + n, 0, HASH_CBLOCK - 8 - n);
|
|
||||||
|
|
||||||
p += HASH_CBLOCK - 8;
|
|
||||||
#if defined(DATA_ORDER_IS_BIG_ENDIAN)
|
|
||||||
(void)HOST_l2c(c->Nh, p);
|
|
||||||
(void)HOST_l2c(c->Nl, p);
|
|
||||||
#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
|
|
||||||
(void)HOST_l2c(c->Nl, p);
|
|
||||||
(void)HOST_l2c(c->Nh, p);
|
|
||||||
#endif
|
|
||||||
p -= HASH_CBLOCK;
|
|
||||||
HASH_BLOCK_DATA_ORDER(c, p, 1);
|
|
||||||
c->num = 0;
|
|
||||||
// OPENSSL_cleanse(p, HASH_CBLOCK);
|
|
||||||
//Erik: Since we don't do encryption secure cleaning is not needed
|
|
||||||
memset(p, 0, HASH_CBLOCK);
|
|
||||||
|
|
||||||
HASH_MAKE_STRING(c, md);
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
@ -1,173 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
||||||
*
|
|
||||||
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
|
||||||
* in the file LICENSE in the source distribution or at
|
|
||||||
* https://www.openssl.org/source/license.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Modifications 2021 Paul Scherrer Institut
|
|
||||||
* Removed most of the code that is not relevant for our scope.
|
|
||||||
* Snippets copied from md5_local.h or md32_common.h has been marked
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef HEADER_MD5_H
|
|
||||||
# define HEADER_MD5_H
|
|
||||||
|
|
||||||
# include <stddef.h>
|
|
||||||
|
|
||||||
# ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
# endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
||||||
* ! MD5_LONG has to be at least 32 bits wide. !
|
|
||||||
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
||||||
*/
|
|
||||||
# define MD5_LONG unsigned int
|
|
||||||
# define MD5_CBLOCK 64
|
|
||||||
# define MD5_LBLOCK (MD5_CBLOCK/4)
|
|
||||||
# define MD5_DIGEST_LENGTH 16
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* Comment from md32_common.h
|
|
||||||
*/
|
|
||||||
/*-
|
|
||||||
* This is a generic 32 bit "collector" for message digest algorithms.
|
|
||||||
* Whenever needed it collects input character stream into chunks of
|
|
||||||
* 32 bit values and invokes a block function that performs actual hash
|
|
||||||
* calculations.
|
|
||||||
*
|
|
||||||
* Porting guide.
|
|
||||||
*
|
|
||||||
* Obligatory macros:
|
|
||||||
*
|
|
||||||
* DATA_ORDER_IS_BIG_ENDIAN or DATA_ORDER_IS_LITTLE_ENDIAN
|
|
||||||
* this macro defines byte order of input stream.
|
|
||||||
* HASH_CBLOCK
|
|
||||||
* size of a unit chunk HASH_BLOCK operates on.
|
|
||||||
* HASH_LONG
|
|
||||||
* has to be at least 32 bit wide.
|
|
||||||
* HASH_CTX
|
|
||||||
* context structure that at least contains following
|
|
||||||
* members:
|
|
||||||
* typedef struct {
|
|
||||||
* ...
|
|
||||||
* HASH_LONG Nl,Nh;
|
|
||||||
* either {
|
|
||||||
* HASH_LONG data[HASH_LBLOCK];
|
|
||||||
* unsigned char data[HASH_CBLOCK];
|
|
||||||
* };
|
|
||||||
* unsigned int num;
|
|
||||||
* ...
|
|
||||||
* } HASH_CTX;
|
|
||||||
* data[] vector is expected to be zeroed upon first call to
|
|
||||||
* HASH_UPDATE.
|
|
||||||
* HASH_UPDATE
|
|
||||||
* name of "Update" function, implemented here.
|
|
||||||
* HASH_TRANSFORM
|
|
||||||
* name of "Transform" function, implemented here.
|
|
||||||
* HASH_FINAL
|
|
||||||
* name of "Final" function, implemented here.
|
|
||||||
* HASH_BLOCK_DATA_ORDER
|
|
||||||
* name of "block" function capable of treating *unaligned* input
|
|
||||||
* message in original (data) byte order, implemented externally.
|
|
||||||
* HASH_MAKE_STRING
|
|
||||||
* macro converting context variables to an ASCII hash string.
|
|
||||||
*
|
|
||||||
* MD5 example:
|
|
||||||
*
|
|
||||||
* #define DATA_ORDER_IS_LITTLE_ENDIAN
|
|
||||||
*
|
|
||||||
* #define HASH_LONG MD5_LONG
|
|
||||||
* #define HASH_CTX MD5_CTX
|
|
||||||
* #define HASH_CBLOCK MD5_CBLOCK
|
|
||||||
* #define HASH_UPDATE MD5_Update
|
|
||||||
* #define HASH_TRANSFORM MD5_Transform
|
|
||||||
* #define HASH_FINAL MD5_Final
|
|
||||||
* #define HASH_BLOCK_DATA_ORDER md5_block_data_order
|
|
||||||
*/
|
|
||||||
# define MD32_REG_T int
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* Made default little endian if big endian not defined
|
|
||||||
*/
|
|
||||||
#ifndef DATA_ORDER_IS_BIG_ENDIAN
|
|
||||||
#define DATA_ORDER_IS_LITTLE_ENDIAN
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* Macros exported from md32_common.h
|
|
||||||
*/
|
|
||||||
#define HASH_LONG MD5_LONG
|
|
||||||
#define HASH_CTX MD5_CTX
|
|
||||||
#define HASH_CBLOCK MD5_CBLOCK
|
|
||||||
#define HASH_UPDATE MD5_Update
|
|
||||||
#define HASH_TRANSFORM MD5_Transform
|
|
||||||
#define HASH_FINAL MD5_Final
|
|
||||||
#define HASH_BLOCK_DATA_ORDER md5_block_data_order
|
|
||||||
#define HASH_MAKE_STRING(c,s) do { \
|
|
||||||
unsigned long ll; \
|
|
||||||
ll=(c)->A; (void)HOST_l2c(ll,(s)); \
|
|
||||||
ll=(c)->B; (void)HOST_l2c(ll,(s)); \
|
|
||||||
ll=(c)->C; (void)HOST_l2c(ll,(s)); \
|
|
||||||
ll=(c)->D; (void)HOST_l2c(ll,(s)); \
|
|
||||||
} while (0)
|
|
||||||
#define ROTATE(a,n) (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
|
|
||||||
#if defined(DATA_ORDER_IS_BIG_ENDIAN)
|
|
||||||
|
|
||||||
# define HOST_c2l(c,l) (l =(((unsigned long)(*((c)++)))<<24), \
|
|
||||||
l|=(((unsigned long)(*((c)++)))<<16), \
|
|
||||||
l|=(((unsigned long)(*((c)++)))<< 8), \
|
|
||||||
l|=(((unsigned long)(*((c)++))) ) )
|
|
||||||
# define HOST_l2c(l,c) (*((c)++)=(unsigned char)(((l)>>24)&0xff), \
|
|
||||||
*((c)++)=(unsigned char)(((l)>>16)&0xff), \
|
|
||||||
*((c)++)=(unsigned char)(((l)>> 8)&0xff), \
|
|
||||||
*((c)++)=(unsigned char)(((l) )&0xff), \
|
|
||||||
l)
|
|
||||||
|
|
||||||
#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
|
|
||||||
|
|
||||||
# define HOST_c2l(c,l) (l =(((unsigned long)(*((c)++))) ), \
|
|
||||||
l|=(((unsigned long)(*((c)++)))<< 8), \
|
|
||||||
l|=(((unsigned long)(*((c)++)))<<16), \
|
|
||||||
l|=(((unsigned long)(*((c)++)))<<24) )
|
|
||||||
# define HOST_l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \
|
|
||||||
*((c)++)=(unsigned char)(((l)>> 8)&0xff), \
|
|
||||||
*((c)++)=(unsigned char)(((l)>>16)&0xff), \
|
|
||||||
*((c)++)=(unsigned char)(((l)>>24)&0xff), \
|
|
||||||
l)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct MD5state_st {
|
|
||||||
MD5_LONG A, B, C, D;
|
|
||||||
MD5_LONG Nl, Nh;
|
|
||||||
MD5_LONG data[MD5_LBLOCK];
|
|
||||||
unsigned int num;
|
|
||||||
} MD5_CTX;
|
|
||||||
|
|
||||||
int MD5_Init(MD5_CTX *c);
|
|
||||||
int MD5_Update(MD5_CTX *c, const void *data, size_t len);
|
|
||||||
int MD5_Final(unsigned char *md, MD5_CTX *c);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Modification 2021 Paul Scherrer Institut
|
|
||||||
* from md32_common.h
|
|
||||||
*/
|
|
||||||
void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
|
|
||||||
# ifdef __cplusplus
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
515
slsSupportLib/src/md5.c
Normal file
515
slsSupportLib/src/md5.c
Normal file
@ -0,0 +1,515 @@
|
|||||||
|
/*
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||||
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
|
* in the file LICENSE in the source distribution or at
|
||||||
|
* https://www.openssl.org/source/license.html
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* MD5 low level APIs are deprecated for public use, but still ok for
|
||||||
|
* internal use.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Modifications 2021 Paul Scherrer Institut
|
||||||
|
* Removed most of the code that is not relevant for our scope
|
||||||
|
* from md5_dgst.c and renamed to md5.c
|
||||||
|
* from md32_common.h and replaced their macros with their defines
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* Header included was md5_local.h
|
||||||
|
* and string.h header was included
|
||||||
|
* sls namespace added
|
||||||
|
*/
|
||||||
|
#include "sls/md5.h"
|
||||||
|
#include <string.h>
|
||||||
|
#ifdef __cplusplus
|
||||||
|
namespace sls {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* Macros exported from md5_local.h
|
||||||
|
*/
|
||||||
|
#define F(b,c,d) ((((c) ^ (d)) & (b)) ^ (d))
|
||||||
|
#define G(b,c,d) ((((b) ^ (c)) & (d)) ^ (c))
|
||||||
|
#define H(b,c,d) ((b) ^ (c) ^ (d))
|
||||||
|
#define I(b,c,d) (((~(d)) | (b)) ^ (c))
|
||||||
|
|
||||||
|
#define R0(a,b,c,d,k,s,t) { \
|
||||||
|
a+=((k)+(t)+F((b),(c),(d))); \
|
||||||
|
a=ROTATE(a,s); \
|
||||||
|
a+=b; };
|
||||||
|
|
||||||
|
#define R1(a,b,c,d,k,s,t) { \
|
||||||
|
a+=((k)+(t)+G((b),(c),(d))); \
|
||||||
|
a=ROTATE(a,s); \
|
||||||
|
a+=b; };
|
||||||
|
|
||||||
|
#define R2(a,b,c,d,k,s,t) { \
|
||||||
|
a+=((k)+(t)+H((b),(c),(d))); \
|
||||||
|
a=ROTATE(a,s); \
|
||||||
|
a+=b; };
|
||||||
|
|
||||||
|
#define R3(a,b,c,d,k,s,t) { \
|
||||||
|
a+=((k)+(t)+I((b),(c),(d))); \
|
||||||
|
a=ROTATE(a,s); \
|
||||||
|
a+=b; };
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Implemented from RFC1321 The MD5 Message-Digest Algorithm
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define INIT_DATA_A (unsigned long)0x67452301L
|
||||||
|
#define INIT_DATA_B (unsigned long)0xefcdab89L
|
||||||
|
#define INIT_DATA_C (unsigned long)0x98badcfeL
|
||||||
|
#define INIT_DATA_D (unsigned long)0x10325476L
|
||||||
|
|
||||||
|
int MD5_Init_SLS(MD5_CTX *c)
|
||||||
|
{
|
||||||
|
memset(c, 0, sizeof(*c));
|
||||||
|
c->A = INIT_DATA_A;
|
||||||
|
c->B = INIT_DATA_B;
|
||||||
|
c->C = INIT_DATA_C;
|
||||||
|
c->D = INIT_DATA_D;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void md5_block_data_order(MD5_CTX *c, const void *data_, size_t num)
|
||||||
|
{
|
||||||
|
const unsigned char *data = data_;
|
||||||
|
register unsigned MD32_REG_T A, B, C, D, l;
|
||||||
|
/* See comment in crypto/sha/sha_local.h for details. */
|
||||||
|
unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
|
||||||
|
XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
|
||||||
|
# define X(i) XX##i
|
||||||
|
|
||||||
|
A = c->A;
|
||||||
|
B = c->B;
|
||||||
|
C = c->C;
|
||||||
|
D = c->D;
|
||||||
|
|
||||||
|
for (; num--;) {
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(0) = l;
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(1) = l;
|
||||||
|
/* Round 0 */
|
||||||
|
R0(A, B, C, D, X(0), 7, 0xd76aa478L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(2) = l;
|
||||||
|
R0(D, A, B, C, X(1), 12, 0xe8c7b756L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(3) = l;
|
||||||
|
R0(C, D, A, B, X(2), 17, 0x242070dbL);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(4) = l;
|
||||||
|
R0(B, C, D, A, X(3), 22, 0xc1bdceeeL);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(5) = l;
|
||||||
|
R0(A, B, C, D, X(4), 7, 0xf57c0fafL);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(6) = l;
|
||||||
|
R0(D, A, B, C, X(5), 12, 0x4787c62aL);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(7) = l;
|
||||||
|
R0(C, D, A, B, X(6), 17, 0xa8304613L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(8) = l;
|
||||||
|
R0(B, C, D, A, X(7), 22, 0xfd469501L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(9) = l;
|
||||||
|
R0(A, B, C, D, X(8), 7, 0x698098d8L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(10) = l;
|
||||||
|
R0(D, A, B, C, X(9), 12, 0x8b44f7afL);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(11) = l;
|
||||||
|
R0(C, D, A, B, X(10), 17, 0xffff5bb1L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(12) = l;
|
||||||
|
R0(B, C, D, A, X(11), 22, 0x895cd7beL);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(13) = l;
|
||||||
|
R0(A, B, C, D, X(12), 7, 0x6b901122L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(14) = l;
|
||||||
|
R0(D, A, B, C, X(13), 12, 0xfd987193L);
|
||||||
|
(void)HOST_c2l(data, l);
|
||||||
|
X(15) = l;
|
||||||
|
R0(C, D, A, B, X(14), 17, 0xa679438eL);
|
||||||
|
R0(B, C, D, A, X(15), 22, 0x49b40821L);
|
||||||
|
/* Round 1 */
|
||||||
|
R1(A, B, C, D, X(1), 5, 0xf61e2562L);
|
||||||
|
R1(D, A, B, C, X(6), 9, 0xc040b340L);
|
||||||
|
R1(C, D, A, B, X(11), 14, 0x265e5a51L);
|
||||||
|
R1(B, C, D, A, X(0), 20, 0xe9b6c7aaL);
|
||||||
|
R1(A, B, C, D, X(5), 5, 0xd62f105dL);
|
||||||
|
R1(D, A, B, C, X(10), 9, 0x02441453L);
|
||||||
|
R1(C, D, A, B, X(15), 14, 0xd8a1e681L);
|
||||||
|
R1(B, C, D, A, X(4), 20, 0xe7d3fbc8L);
|
||||||
|
R1(A, B, C, D, X(9), 5, 0x21e1cde6L);
|
||||||
|
R1(D, A, B, C, X(14), 9, 0xc33707d6L);
|
||||||
|
R1(C, D, A, B, X(3), 14, 0xf4d50d87L);
|
||||||
|
R1(B, C, D, A, X(8), 20, 0x455a14edL);
|
||||||
|
R1(A, B, C, D, X(13), 5, 0xa9e3e905L);
|
||||||
|
R1(D, A, B, C, X(2), 9, 0xfcefa3f8L);
|
||||||
|
R1(C, D, A, B, X(7), 14, 0x676f02d9L);
|
||||||
|
R1(B, C, D, A, X(12), 20, 0x8d2a4c8aL);
|
||||||
|
/* Round 2 */
|
||||||
|
R2(A, B, C, D, X(5), 4, 0xfffa3942L);
|
||||||
|
R2(D, A, B, C, X(8), 11, 0x8771f681L);
|
||||||
|
R2(C, D, A, B, X(11), 16, 0x6d9d6122L);
|
||||||
|
R2(B, C, D, A, X(14), 23, 0xfde5380cL);
|
||||||
|
R2(A, B, C, D, X(1), 4, 0xa4beea44L);
|
||||||
|
R2(D, A, B, C, X(4), 11, 0x4bdecfa9L);
|
||||||
|
R2(C, D, A, B, X(7), 16, 0xf6bb4b60L);
|
||||||
|
R2(B, C, D, A, X(10), 23, 0xbebfbc70L);
|
||||||
|
R2(A, B, C, D, X(13), 4, 0x289b7ec6L);
|
||||||
|
R2(D, A, B, C, X(0), 11, 0xeaa127faL);
|
||||||
|
R2(C, D, A, B, X(3), 16, 0xd4ef3085L);
|
||||||
|
R2(B, C, D, A, X(6), 23, 0x04881d05L);
|
||||||
|
R2(A, B, C, D, X(9), 4, 0xd9d4d039L);
|
||||||
|
R2(D, A, B, C, X(12), 11, 0xe6db99e5L);
|
||||||
|
R2(C, D, A, B, X(15), 16, 0x1fa27cf8L);
|
||||||
|
R2(B, C, D, A, X(2), 23, 0xc4ac5665L);
|
||||||
|
/* Round 3 */
|
||||||
|
R3(A, B, C, D, X(0), 6, 0xf4292244L);
|
||||||
|
R3(D, A, B, C, X(7), 10, 0x432aff97L);
|
||||||
|
R3(C, D, A, B, X(14), 15, 0xab9423a7L);
|
||||||
|
R3(B, C, D, A, X(5), 21, 0xfc93a039L);
|
||||||
|
R3(A, B, C, D, X(12), 6, 0x655b59c3L);
|
||||||
|
R3(D, A, B, C, X(3), 10, 0x8f0ccc92L);
|
||||||
|
R3(C, D, A, B, X(10), 15, 0xffeff47dL);
|
||||||
|
R3(B, C, D, A, X(1), 21, 0x85845dd1L);
|
||||||
|
R3(A, B, C, D, X(8), 6, 0x6fa87e4fL);
|
||||||
|
R3(D, A, B, C, X(15), 10, 0xfe2ce6e0L);
|
||||||
|
R3(C, D, A, B, X(6), 15, 0xa3014314L);
|
||||||
|
R3(B, C, D, A, X(13), 21, 0x4e0811a1L);
|
||||||
|
R3(A, B, C, D, X(4), 6, 0xf7537e82L);
|
||||||
|
R3(D, A, B, C, X(11), 10, 0xbd3af235L);
|
||||||
|
R3(C, D, A, B, X(2), 15, 0x2ad7d2bbL);
|
||||||
|
R3(B, C, D, A, X(9), 21, 0xeb86d391L);
|
||||||
|
|
||||||
|
A = c->A += A;
|
||||||
|
B = c->B += B;
|
||||||
|
C = c->C += C;
|
||||||
|
D = c->D += D;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* from md32_common.h
|
||||||
|
*/
|
||||||
|
int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
|
||||||
|
{
|
||||||
|
const unsigned char *data = data_;
|
||||||
|
unsigned char *p;
|
||||||
|
HASH_LONG l;
|
||||||
|
size_t n;
|
||||||
|
|
||||||
|
if (len == 0)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
l = (c->Nl + (((HASH_LONG) len) << 3)) & 0xffffffffUL;
|
||||||
|
if (l < c->Nl) /* overflow */
|
||||||
|
c->Nh++;
|
||||||
|
c->Nh += (HASH_LONG) (len >> 29); /* might cause compiler warning on
|
||||||
|
* 16-bit */
|
||||||
|
c->Nl = l;
|
||||||
|
|
||||||
|
n = c->num;
|
||||||
|
if (n != 0) {
|
||||||
|
p = (unsigned char *)c->data;
|
||||||
|
|
||||||
|
if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {
|
||||||
|
memcpy(p + n, data, HASH_CBLOCK - n);
|
||||||
|
HASH_BLOCK_DATA_ORDER(c, p, 1);
|
||||||
|
n = HASH_CBLOCK - n;
|
||||||
|
data += n;
|
||||||
|
len -= n;
|
||||||
|
c->num = 0;
|
||||||
|
/*
|
||||||
|
* We use memset rather than OPENSSL_cleanse() here deliberately.
|
||||||
|
* Using OPENSSL_cleanse() here could be a performance issue. It
|
||||||
|
* will get properly cleansed on finalisation so this isn't a
|
||||||
|
* security problem.
|
||||||
|
*/
|
||||||
|
memset(p, 0, HASH_CBLOCK); /* keep it zeroed */
|
||||||
|
} else {
|
||||||
|
memcpy(p + n, data, len);
|
||||||
|
c->num += (unsigned int)len;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
n = len / HASH_CBLOCK;
|
||||||
|
if (n > 0) {
|
||||||
|
HASH_BLOCK_DATA_ORDER(c, data, n);
|
||||||
|
n *= HASH_CBLOCK;
|
||||||
|
data += n;
|
||||||
|
len -= n;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (len != 0) {
|
||||||
|
p = (unsigned char *)c->data;
|
||||||
|
c->num = (unsigned int)len;
|
||||||
|
memcpy(p, data, len);
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modification 2021 Paul Scherrer Institut
|
||||||
|
* from md32_common.h
|
||||||
|
*/
|
||||||
|
int HASH_FINAL(unsigned char *md, HASH_CTX *c)
|
||||||
|
{
|
||||||
|
unsigned char *p = (unsigned char *)c->data;
|
||||||
|
size_t n = c->num;
|
||||||
|
|
||||||
|
p[n] = 0x80; /* there is always room for one */
|
||||||
|
n++;
|
||||||
|
|
||||||
|
if (n > (HASH_CBLOCK - 8)) {
|
||||||
|
memset(p + n, 0, HASH_CBLOCK - n);
|
||||||
|
n = 0;
|
||||||
|
HASH_BLOCK_DATA_ORDER(c, p, 1);
|
||||||
|
}
|
||||||
|
memset(p + n, 0, HASH_CBLOCK - 8 - n);
|
||||||
|
|
||||||
|
p += HASH_CBLOCK - 8;
|
||||||
|
#if defined(DATA_ORDER_IS_BIG_ENDIAN)
|
||||||
|
(void)HOST_l2c(c->Nh, p);
|
||||||
|
(void)HOST_l2c(c->Nl, p);
|
||||||
|
#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
|
||||||
|
(void)HOST_l2c(c->Nl, p);
|
||||||
|
(void)HOST_l2c(c->Nh, p);
|
||||||
|
#endif
|
||||||
|
p -= HASH_CBLOCK;
|
||||||
|
HASH_BLOCK_DATA_ORDER(c, p, 1);
|
||||||
|
c->num = 0;
|
||||||
|
// OPENSSL_cleanse(p, HASH_CBLOCK);
|
||||||
|
//Erik: Since we don't do encryption secure cleaning is not needed
|
||||||
|
memset(p, 0, HASH_CBLOCK);
|
||||||
|
|
||||||
|
HASH_MAKE_STRING(c, md);
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} // namespace sls
|
||||||
|
#endif
|
||||||
30
slsSupportLib/src/md5_helper.cpp
Normal file
30
slsSupportLib/src/md5_helper.cpp
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
#include "sls/md5_helper.h"
|
||||||
|
|
||||||
|
#include "sls/md5.h"
|
||||||
|
|
||||||
|
#include <iomanip>
|
||||||
|
#include <sstream>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
namespace sls {
|
||||||
|
|
||||||
|
std::string md5_calculate_checksum(char *buffer, ssize_t bytes) {
|
||||||
|
MD5_CTX c;
|
||||||
|
if (!MD5_Init_SLS(&c)) {
|
||||||
|
throw std::runtime_error(
|
||||||
|
"Could not calculate md5 checksum.[initializing]");
|
||||||
|
}
|
||||||
|
if (!MD5_Update_SLS(&c, buffer, bytes)) {
|
||||||
|
throw std::runtime_error("Could not calculate md5 checksum.[Updating]");
|
||||||
|
}
|
||||||
|
unsigned char out[MD5_DIGEST_LENGTH];
|
||||||
|
if (!MD5_Final_SLS(out, &c)) {
|
||||||
|
throw std::runtime_error("Could not calculate md5 checksum.[Final]");
|
||||||
|
}
|
||||||
|
std::ostringstream oss;
|
||||||
|
for (int i = 0; i != MD5_DIGEST_LENGTH; ++i)
|
||||||
|
oss << std::hex << std::setw(2) << std::setfill('0') << +out[i];
|
||||||
|
return oss.str();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace sls
|
||||||
Loading…
x
Reference in New Issue
Block a user