PR-759 Persistent storage gets a checksum and uses the common configuration file
This commit is contained in:
Garret Fick
parent
6d083e5c85
commit
ce1143f84c
|
|
@ -30,7 +30,7 @@ class mutex;
|
|||
}
|
||||
|
||||
struct GlueVariable;
|
||||
struct GlueVariablesBinding;
|
||||
class GlueVariablesBinding;
|
||||
|
||||
/** \addtogroup openplc_runtime
|
||||
* @{
|
||||
|
|
@ -142,7 +142,6 @@ asiodnp3::OutstationStackConfig dnp3_create_config(std::istream& cfg_stream,
|
|||
Dnp3MappedGroup& measurements,
|
||||
uint16_t& port);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief Start the DNP3 server running on the specified port and configured
|
||||
/// using the specified stream.
|
||||
///
|
||||
|
|
@ -161,7 +160,6 @@ void dnp3s_start_server(std::unique_ptr<std::istream, std::function<void(std::is
|
|||
volatile bool& run,
|
||||
const GlueVariablesBinding& glue_variables);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief Start the DNP3 server running on the specified port and configured
|
||||
/// using the specified stream.
|
||||
///
|
||||
|
|
|
|||
|
|
@ -89,11 +89,10 @@ enum IecGlueValueType {
|
|||
#ifndef OPLC_GLUE_BOOL_GROUP
|
||||
#define OPLC_GLUE_BOOL_GROUP
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
/// @brief Defines the mapping for a group of glued boolean variable.
|
||||
///
|
||||
/// This definition must be consistent with what is produced by the @ref glue_generator.
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
/// This definition must be consistent with what is produced by the @ref
|
||||
/// glue_generator.
|
||||
struct GlueBoolGroup {
|
||||
/// The first index for this array. If we are iterating over the glue
|
||||
/// variables, then this index is superfluous, but it is very helpful
|
||||
|
|
@ -140,18 +139,31 @@ struct GlueVariable {
|
|||
|
||||
/// @brief Defines accessors for glue variables.
|
||||
/// This structure wraps up items that are available as globals, but this
|
||||
/// allows a straighforward way to inject definitions into tests, so it is
|
||||
/// allows a straightforward way to inject definitions into tests, so it is
|
||||
/// preferred to use this structure rather than globals.
|
||||
struct GlueVariablesBinding {
|
||||
class GlueVariablesBinding {
|
||||
|
||||
public:
|
||||
/// Initialize a new instance of the glue bindings.
|
||||
/// @param buffer_lock A lock for accessing the value part of bindings
|
||||
/// @param size The number of bindings we have
|
||||
/// @param glue_variables The glue variable binding definitions
|
||||
/// @param checksum A checksum for the bindining definitions. That is
|
||||
/// when we generated the bindings, a checking from the source.
|
||||
GlueVariablesBinding(std::mutex* buffer_lock, const std::uint16_t size,
|
||||
const GlueVariable* glue_variables) :
|
||||
const GlueVariable* glue_variables,
|
||||
const char* checksum) :
|
||||
buffer_lock(buffer_lock),
|
||||
size(size),
|
||||
glue_variables(glue_variables)
|
||||
|
||||
glue_variables(glue_variables),
|
||||
checksum(checksum)
|
||||
{}
|
||||
|
||||
private:
|
||||
// Don't allow copying of the bindings.
|
||||
GlueVariablesBinding(const GlueVariablesBinding& copy);
|
||||
|
||||
public:
|
||||
/// @brief Mutex for the glue variables
|
||||
std::mutex* buffer_lock;
|
||||
|
||||
|
|
@ -161,7 +173,12 @@ struct GlueVariablesBinding {
|
|||
/// @brief The glue variables array
|
||||
const GlueVariable* glue_variables;
|
||||
|
||||
/// @brief Find a glue varia&glue_mutexble based on the specification of
|
||||
/// @brief Checksum for the variables definition
|
||||
/// This might be used to check, between instances of running the
|
||||
/// application whether the variables are likely to have changed.
|
||||
const char* checksum;
|
||||
|
||||
/// @brief Find a glue variable based on the specification of
|
||||
/// the variable.
|
||||
/// @return the variable or null if there is no variable that matches all
|
||||
/// criteria in the specification.
|
||||
|
|
|
|||
|
|
@ -84,11 +84,12 @@ extern std::mutex bufferLock;
|
|||
extern unsigned long long common_ticktime__;
|
||||
|
||||
struct GlueVariable;
|
||||
struct GlueVariablesBinding;
|
||||
class GlueVariablesBinding;
|
||||
|
||||
extern const std::uint16_t OPLCGLUE_GLUE_SIZE;
|
||||
extern const GlueVariable oplc_glue_vars[];
|
||||
extern const std::size_t OPLC_LOCATED_VARIABLES_MEM_SIZE;
|
||||
extern const char OPLCGLUE_MD5_DIGEST[];
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
//FUNCTION PROTOTYPES
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ void sleep_until(struct timespec *ts, int delay)
|
|||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// \brief Helper function - Makes the running thread sleep for the ammount of
|
||||
/// \brief Helper function - Makes the running thread sleep for the amount of
|
||||
/// time in milliseconds
|
||||
/// \param milliseconds to sleep
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -28,10 +28,12 @@
|
|||
#include <thread>
|
||||
#include <type_traits>
|
||||
|
||||
#include <ini.h>
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
#include "ladder.h"
|
||||
#include "glue.h"
|
||||
#include "ini_util.h"
|
||||
#include "ladder.h"
|
||||
|
||||
/** \addtogroup openplc_runtime
|
||||
* @{
|
||||
|
|
@ -124,10 +126,52 @@ size_t pstorage_copy_glue(const GlueVariablesBinding& bindings, char* buffer) {
|
|||
return num_written;
|
||||
}
|
||||
|
||||
int8_t pstorage_run(const GlueVariablesBinding& bindings, volatile bool& run,
|
||||
chrono::milliseconds sleep_time,
|
||||
/// Container for reading in configuration from the config.ini
|
||||
/// This is populated with values from the config file.
|
||||
struct PstorageConfig {
|
||||
PstorageConfig() :
|
||||
poll_interval(std::chrono::seconds(10))
|
||||
{}
|
||||
std::chrono::seconds poll_interval;
|
||||
};
|
||||
|
||||
int pstorage_cfg_handler(void* user_data, const char* section,
|
||||
const char* name, const char* value) {
|
||||
if (strcmp("pstorage", section) != 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
auto config = reinterpret_cast<PstorageConfig*>(user_data);
|
||||
|
||||
if (strcmp(name, "poll_interval") == 0) {
|
||||
// We do not allow a poll period of less than 1 second as that
|
||||
// might cause lock contention problems.
|
||||
config->poll_interval = std::chrono::seconds(max(1, atoi(value)));
|
||||
} else {
|
||||
spdlog::warn("Unknown configuration item {}", name);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int8_t pstorage_run(std::unique_ptr<std::istream, std::function<void(std::istream*)>>& cfg_stream,
|
||||
const char* cfg_overrides,
|
||||
const GlueVariablesBinding& bindings,
|
||||
volatile bool& run,
|
||||
function<std::ostream*(void)> stream_fn)
|
||||
{
|
||||
PstorageConfig config;
|
||||
ini_parse_stream(istream_fgets, cfg_stream.get(), pstorage_cfg_handler, &config);
|
||||
|
||||
// We are done with the file, so release the unique ptr. Normally this
|
||||
// will close the reference to the file
|
||||
cfg_stream.reset(nullptr);
|
||||
|
||||
if (strlen(cfg_overrides) > 0) {
|
||||
config.poll_interval = std::chrono::seconds(max(1, atoi(cfg_overrides)));
|
||||
}
|
||||
|
||||
const char endianness_header[2] = { IS_BIG_ENDIAN, '\n'};
|
||||
|
||||
// This isn't ideal because we really only need enough space for
|
||||
|
|
@ -157,6 +201,8 @@ int8_t pstorage_run(const GlueVariablesBinding& bindings, volatile bool& run,
|
|||
}
|
||||
out_stream->write(FILE_HEADER, FILE_HEADER_SIZE);
|
||||
out_stream->write(endianness_header, 2);
|
||||
out_stream->write(bindings.checksum, strlen(bindings.checksum));
|
||||
out_stream->put('\n');
|
||||
out_stream->write(buffer, num_written);
|
||||
|
||||
spdlog::info("Persistent storage updated");
|
||||
|
|
@ -170,7 +216,7 @@ int8_t pstorage_run(const GlueVariablesBinding& bindings, volatile bool& run,
|
|||
// Since we just wrote, we sleep.
|
||||
// TODO this needs a new mechanism for sleeping because this can
|
||||
// delay shutdown/stop if polling is long.
|
||||
this_thread::sleep_for(sleep_time);
|
||||
this_thread::sleep_for(config.poll_interval);
|
||||
}
|
||||
|
||||
spdlog::debug("Persistent storage ending normally");
|
||||
|
|
@ -210,6 +256,20 @@ int8_t pstorage_read(istream& input_stream,
|
|||
return -2;
|
||||
}
|
||||
|
||||
// We have a digest in the header to try to prevent accidentally using
|
||||
// the wrong persistence file for a particular runtime.
|
||||
char checksum_check[32];
|
||||
if (read_and_check(input_stream, bindings.checksum, checksum_check, 32) != 0) {
|
||||
return -3;
|
||||
}
|
||||
|
||||
// Just add one newline character
|
||||
char padding_expected[1] = { '\n' };
|
||||
char padding_check[1];
|
||||
if (read_and_check(input_stream, padding_expected, padding_check, 1) != 0) {
|
||||
return -4;
|
||||
}
|
||||
|
||||
// Now we know that the format is right, so read in the rest. We read
|
||||
// variable by variable so that we can assign into the right value.
|
||||
for (uint16_t index(0); index < bindings.size; ++index) {
|
||||
|
|
@ -239,7 +299,7 @@ int8_t pstorage_read(istream& input_stream,
|
|||
break;
|
||||
default:
|
||||
spdlog::error("Unexpected glue variable type {}", glue.size);
|
||||
return -3;
|
||||
return -5;
|
||||
}
|
||||
|
||||
// Read the required number of bytes from the stream
|
||||
|
|
@ -248,7 +308,7 @@ int8_t pstorage_read(istream& input_stream,
|
|||
char buffer[8];
|
||||
if (!input_stream.read(buffer, num_bytes)) {
|
||||
spdlog::error("Persistent storage file too short; partially read");
|
||||
return -4;
|
||||
return -6;
|
||||
}
|
||||
|
||||
// Assign the value into the glue value. The value is ether a simple
|
||||
|
|
@ -283,9 +343,15 @@ void pstorage_service_run(const GlueVariablesBinding& binding,
|
|||
|
||||
// We don't allow a poll duration of less than one second otherwise
|
||||
// that can have detrimental effects on performance
|
||||
int duration_seconds = max(1, atoi(config));
|
||||
auto create_stream = []() { return new ofstream("persistent.file", ios::binary); };
|
||||
pstorage_run(binding, run, chrono::milliseconds(duration_seconds * 1000), create_stream);
|
||||
|
||||
unique_ptr<istream, function<void(istream*)>> cfg_stream(new ifstream("../etc/config.ini"), [](istream* s)
|
||||
{
|
||||
reinterpret_cast<ifstream*>(s)->close();
|
||||
delete s;
|
||||
});
|
||||
|
||||
pstorage_run(cfg_stream, config, binding, run, create_stream);
|
||||
}
|
||||
|
||||
/** @}*/
|
||||
|
|
|
|||
|
|
@ -69,14 +69,18 @@ std::int8_t pstorage_read(std::istream& input_stream,
|
|||
///
|
||||
/// @note This is defined here so that we can access it from the unit tests.
|
||||
///
|
||||
/// @param cfg_stream An input stream to read configuration information
|
||||
/// from. This will be reset once use of the stream has
|
||||
/// been completed.
|
||||
/// @param custom_config Additional configuration information that we process.
|
||||
/// @param bindings The glue bindings to use.
|
||||
/// @param run A flag that indicates if we should terminate the process.
|
||||
/// @param sleep_time How long to wait between each write cycle.
|
||||
/// @return Zero on success, otherwise non-zero. This function may fail
|
||||
/// part way through. Failure does not mean no variables have been set.
|
||||
std::int8_t pstorage_run(const GlueVariablesBinding& bindings,
|
||||
std::int8_t pstorage_run(std::unique_ptr<std::istream, std::function<void(std::istream*)>>& cfg_stream,
|
||||
const char* custom_config,
|
||||
const GlueVariablesBinding& bindings,
|
||||
volatile bool& run,
|
||||
std::chrono::milliseconds sleep_time,
|
||||
std::function<std::ostream*(void)> stream_fn);
|
||||
|
||||
/** @}*/
|
||||
|
|
|
|||
|
|
@ -62,12 +62,12 @@ ServiceDefinition::ServiceDefinition(const char* name,
|
|||
{}
|
||||
|
||||
void ServiceDefinition::initialize() {
|
||||
GlueVariablesBinding bindings(&bufferLock, OPLCGLUE_GLUE_SIZE, oplc_glue_vars);
|
||||
GlueVariablesBinding bindings(&bufferLock, OPLCGLUE_GLUE_SIZE, oplc_glue_vars, OPLCGLUE_MD5_DIGEST);
|
||||
this->init_fn(bindings);
|
||||
}
|
||||
|
||||
void ServiceDefinition::finalize() {
|
||||
GlueVariablesBinding bindings(&bufferLock, OPLCGLUE_GLUE_SIZE, oplc_glue_vars);
|
||||
GlueVariablesBinding bindings(&bufferLock, OPLCGLUE_GLUE_SIZE, oplc_glue_vars, OPLCGLUE_MD5_DIGEST);
|
||||
this->finalize_fn(bindings);
|
||||
}
|
||||
|
||||
|
|
@ -110,7 +110,8 @@ void ServiceDefinition::stop() {
|
|||
void* ServiceDefinition::run_service(void* user_data) {
|
||||
auto service = reinterpret_cast<ServiceDefinition*>(user_data);
|
||||
|
||||
GlueVariablesBinding bindings(&bufferLock, OPLCGLUE_GLUE_SIZE, oplc_glue_vars);
|
||||
GlueVariablesBinding bindings(&bufferLock, OPLCGLUE_GLUE_SIZE,
|
||||
oplc_glue_vars, OPLCGLUE_MD5_DIGEST);
|
||||
// Start the service. This will not return until the service completes
|
||||
// which is normally because the running flag was set to false.
|
||||
service->start_fn(bindings, service->running, service->config_buffer);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
* @{
|
||||
*/
|
||||
|
||||
struct GlueVariablesBinding;
|
||||
class GlueVariablesBinding;
|
||||
|
||||
const std::size_t MAX_INTERACTIVE_CONFIG_SIZE(1024);
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ typedef std::function<void(const GlueVariablesBinding& binding, volatile bool& r
|
|||
/// about your service and you provide to the service definition a set
|
||||
/// of functions that that your service uses.
|
||||
///
|
||||
/// All services run in their own thread and this mechanism is repsonsible
|
||||
/// All services run in their own thread and this mechanism is responsible
|
||||
/// for creating that thread. This further means that each service, must
|
||||
/// keep only a very short lock on the glue variables so that it cannot
|
||||
/// prevent the main PLC loop from accessing the variables.
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ SCENARIO("create_config", "")
|
|||
{
|
||||
WHEN("stream is empty creates default config")
|
||||
{
|
||||
GlueVariablesBinding bindings(&glue_mutex, 0, nullptr);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 0, nullptr, nullptr);
|
||||
std::stringstream input_stream;
|
||||
const OutstationStackConfig config(dnp3_create_config(input_stream, bindings, binary_commands, analog_commands, measurements, port));
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ SCENARIO("create_config", "")
|
|||
const GlueVariable glue_vars[] = {
|
||||
{ IECLDT_OUT, IECLST_BIT, 0, 0, IECVT_BOOL, &bool_var },
|
||||
};
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars, nullptr);
|
||||
std::stringstream input_stream("[dnp3s]\nbind_location=name:%QX0.0,group:1,index:0,");
|
||||
const OutstationStackConfig config(dnp3_create_config(input_stream, bindings, binary_commands, analog_commands, measurements, port));
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ SCENARIO("create_config", "")
|
|||
const GlueVariable glue_vars[] = {
|
||||
{ IECLDT_IN, IECLST_BIT, 0, 0, IECVT_BOOL, &bool_var },
|
||||
};
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars, nullptr);
|
||||
std::stringstream input_stream("[dnp3s]\nbind_location=name:%IX0.0,group:1,index:1,");
|
||||
const OutstationStackConfig config(dnp3_create_config(input_stream, bindings, binary_commands, analog_commands, measurements, port));
|
||||
|
||||
|
|
@ -123,7 +123,7 @@ SCENARIO("create_config", "")
|
|||
const GlueVariable glue_vars[] = {
|
||||
{ IECLDT_IN, IECLST_BIT, 0, 0, IECVT_BOOL, &bool_var },
|
||||
};
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars, nullptr);
|
||||
std::stringstream input_stream("[dnp3s]\nbind_location=name:%IX0.0,group:12,index:1,");
|
||||
const OutstationStackConfig config(dnp3_create_config(input_stream, bindings, binary_commands, analog_commands, measurements, port));
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ SCENARIO("create_config", "")
|
|||
const GlueVariable glue_vars[] = {
|
||||
{ IECLDT_OUT, IECLST_DOUBLEWORD, 0, 0, IECVT_REAL, &real_var },
|
||||
};
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 1, glue_vars, nullptr);
|
||||
std::stringstream input_stream("[dnp3s]\nbind_location=name:%QD0,group:30,index:1,");
|
||||
const OutstationStackConfig config(dnp3_create_config(input_stream, bindings, binary_commands, analog_commands, measurements, port));
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ SCENARIO("dnp3s_start_server", "")
|
|||
// the run flag is set to false. This should just return quickly
|
||||
volatile bool run_dnp3(false);
|
||||
unique_ptr<istream, std::function<void(istream*)>> cfg_stream(new stringstream(""), [](istream* s) { delete s; });
|
||||
GlueVariablesBinding bindings(&glue_mutex, 0, nullptr);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 0, nullptr, nullptr);
|
||||
|
||||
dnp3s_start_server(cfg_stream, "20000", run_dnp3, bindings);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ using namespace std;
|
|||
#define IS_BIG_ENDIAN (*(uint16_t *)"\0\xff" < 0x100)
|
||||
|
||||
const char VALID_HEADER[] = { (char)137, 'O', 'P', 'L', 'C', 'P', 'S', '\n', 'v', 0, '\n' };
|
||||
const char* CHECKSUM_HEADER = "16d15b8416040cce48b111ce03ee3dab";
|
||||
|
||||
SCENARIO("pstorage_read", "") {
|
||||
|
||||
|
|
@ -35,6 +36,8 @@ SCENARIO("pstorage_read", "") {
|
|||
input_stream.write(VALID_HEADER, 11);
|
||||
char endian_header[2] = { IS_BIG_ENDIAN, '\n'};
|
||||
input_stream.write(endian_header, 2);
|
||||
input_stream.write(CHECKSUM_HEADER, strlen(CHECKSUM_HEADER));
|
||||
input_stream.put('\n');
|
||||
|
||||
GIVEN("simple glue variables") {
|
||||
IEC_LWORD lword_var = 0;
|
||||
|
|
@ -45,7 +48,7 @@ SCENARIO("pstorage_read", "") {
|
|||
{ IECLDT_MEM, IECLST_BYTE, 0, 0, IECVT_USINT, &usint_var },
|
||||
{ IECLDT_MEM, IECLST_BIT, 0, 0, IECVT_BOOL, &bool_var },
|
||||
};
|
||||
GlueVariablesBinding bindings(&glue_mutex, 3, glue_vars);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 3, glue_vars, CHECKSUM_HEADER);
|
||||
|
||||
WHEN("no data") {
|
||||
input_stream.seekg(0);
|
||||
|
|
@ -95,6 +98,8 @@ SCENARIO("pstorage_run") {
|
|||
input_stream.write(VALID_HEADER, 11);
|
||||
char endian_header[2] = { IS_BIG_ENDIAN, '\n'};
|
||||
input_stream.write(endian_header, 2);
|
||||
input_stream.write(CHECKSUM_HEADER, strlen(CHECKSUM_HEADER));
|
||||
input_stream.put('\n');
|
||||
|
||||
GIVEN("glue variables and stream") {
|
||||
IEC_LWORD lword_var = 1;
|
||||
|
|
@ -105,13 +110,14 @@ SCENARIO("pstorage_run") {
|
|||
{ IECLDT_MEM, IECLST_BYTE, 0, 0, IECVT_USINT, &usint_var },
|
||||
{ IECLDT_MEM, IECLST_BIT, 0, 0, IECVT_BOOL, &bool_var },
|
||||
};
|
||||
GlueVariablesBinding bindings(&glue_mutex, 3, glue_vars);
|
||||
GlueVariablesBinding bindings(&glue_mutex, 3, glue_vars, CHECKSUM_HEADER);
|
||||
|
||||
unique_ptr<istream, std::function<void(istream*)>> cfg_stream(new stringstream(""), [](istream* s) { delete s; });
|
||||
|
||||
WHEN("write once") {
|
||||
volatile bool run = false;
|
||||
auto timeout = chrono::milliseconds(0);
|
||||
auto create_stream = []() { return new stringstream(); };
|
||||
REQUIRE(pstorage_run(bindings, run, timeout, create_stream) == 0);
|
||||
REQUIRE(pstorage_run(cfg_stream, "0", bindings, run, create_stream) == 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
|
|||
include_directories(vendor/catch2-2.7.0)
|
||||
|
||||
# The main application that we always build
|
||||
add_executable(glue_generator glue_generator.cpp)
|
||||
add_executable(glue_generator glue_generator.cpp md5.c)
|
||||
|
||||
if (OPLC_BUILD_TESTS)
|
||||
add_executable(gg_unit_test test/glue_generator_test.cpp)
|
||||
add_executable(gg_unit_test test/glue_generator_test.cpp md5.c)
|
||||
enable_testing()
|
||||
add_test(NAME glue_generator_test COMMAND gg_unit_test)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
#include <list>
|
||||
#include <string>
|
||||
|
||||
#include "md5.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
/**
|
||||
|
|
@ -195,11 +197,12 @@ IEC_LINT *special_functions[BUFFER_SIZE];
|
|||
)";
|
||||
}
|
||||
|
||||
int parseIecVars(istream& locatedVars, char *varName, char *varType) {
|
||||
int parseIecVars(istream& locatedVars, char *varName, char *varType, md5_state_s& md5_state) {
|
||||
string line;
|
||||
char buffer[1024];
|
||||
|
||||
if (getline(locatedVars, line)) {
|
||||
md5_append(&md5_state, reinterpret_cast<const md5_byte_t*>(line.c_str()), line.length());
|
||||
int i = 0, j = 0;
|
||||
strncpy(buffer, line.c_str(), 1024);
|
||||
for (i = 0; buffer[i] != '('; i++) {
|
||||
|
|
@ -376,7 +379,13 @@ void generateBottom(ostream& glueVars) {
|
|||
})";
|
||||
}
|
||||
|
||||
void generateBody(istream& locatedVars, ostream& glueVars) {
|
||||
void generateBody(istream& locatedVars, ostream& glueVars, md5_byte_t digest[16]) {
|
||||
// We will generate a checksum of the located variables so that
|
||||
// we can detect likely changes (not intended to be cryptographically
|
||||
// secure). This is only to prevent obvious problems.
|
||||
md5_state_s md5_state;
|
||||
md5_init(&md5_state);
|
||||
|
||||
// Start the generation process. We need to know all of the variables
|
||||
// in advance so that we can appropriately size some storage based
|
||||
// on the variables that are actually needed.
|
||||
|
|
@ -389,7 +398,7 @@ void generateBody(istream& locatedVars, ostream& glueVars) {
|
|||
char iecVar_type[100];
|
||||
int32_t max_index(-1);
|
||||
|
||||
while (parseIecVars(locatedVars, iecVar_name, iecVar_type)) {
|
||||
while (parseIecVars(locatedVars, iecVar_name, iecVar_type, md5_state)) {
|
||||
cout << "varName: " << iecVar_name << "\tvarType: " << iecVar_type;
|
||||
cout << endl;
|
||||
|
||||
|
|
@ -413,6 +422,25 @@ void generateBody(istream& locatedVars, ostream& glueVars) {
|
|||
|
||||
// Generate the unified glue variables
|
||||
generateIntegratedGlue(glueVars, all_vars);
|
||||
|
||||
// Finish the checksum value
|
||||
md5_finish(&md5_state, digest);
|
||||
}
|
||||
|
||||
void generateChecksum(ostream& glueVars, md5_byte_t digest[16]) {
|
||||
char const hex_chars[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
|
||||
|
||||
// We do this in a separate step, otherwise every unit test would have
|
||||
// this value.
|
||||
glueVars << "/// MD5 checksum of the located variables.\n";
|
||||
glueVars << "/// WARNING: this must not be used to trust file contents.\n";
|
||||
glueVars << "extern const char OPLCGLUE_MD5_DIGEST[] = {";
|
||||
for (int i = 0; i <= 16; ++i) {
|
||||
glueVars << '\'' << hex_chars[ ( digest[i] & 0xF0 ) >> 4 ] << "\', ";
|
||||
glueVars << '\'' << hex_chars[ ( digest[i] & 0x0F ) >> 0 ] << "\', ";
|
||||
}
|
||||
glueVars << "};\n";
|
||||
glueVars << "\n\n";
|
||||
}
|
||||
|
||||
/// This is our main function. We define it with a different name and then
|
||||
|
|
@ -461,7 +489,10 @@ int mainImpl(int argc, char const * const *argv) {
|
|||
}
|
||||
|
||||
generateHeader(glueVars);
|
||||
generateBody(locatedVars, glueVars);
|
||||
|
||||
md5_byte_t digest[16];
|
||||
generateBody(locatedVars, glueVars, digest);
|
||||
generateChecksum(glueVars, digest);
|
||||
generateBottom(glueVars);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,387 @@
|
|||
/*
|
||||
Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
L. Peter Deutsch
|
||||
ghost@aladdin.com
|
||||
|
||||
*/
|
||||
/* $Id: md5.c,v 1.1 2010-08-13 10:50:08 degironc Exp $ */
|
||||
/*
|
||||
Independent implementation of MD5 (RFC 1321).
|
||||
|
||||
This code implements the MD5 Algorithm defined in RFC 1321, whose
|
||||
text is available at
|
||||
http://www.ietf.org/rfc/rfc1321.txt
|
||||
The code is derived from the text of the RFC, including the test suite
|
||||
(section A.5) but excluding the rest of Appendix A. It does not include
|
||||
any code or documentation that is identified in the RFC as being
|
||||
copyrighted.
|
||||
|
||||
The original and principal author of md5.c is L. Peter Deutsch
|
||||
<ghost@aladdin.com>. Other authors are noted in the change history
|
||||
that follows (in reverse chronological order):
|
||||
|
||||
2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
|
||||
either statically or dynamically; added missing #include <string.h>
|
||||
in library.
|
||||
2002-03-11 lpd Corrected argument list for main(), and added int return
|
||||
type, in test program and T value program.
|
||||
2002-02-21 lpd Added missing #include <stdio.h> in test program.
|
||||
2000-07-03 lpd Patched to eliminate warnings about "constant is
|
||||
unsigned in ANSI C, signed in traditional"; made test program
|
||||
self-checking.
|
||||
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
|
||||
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
|
||||
1999-05-03 lpd Original version.
|
||||
*/
|
||||
|
||||
#include "md5.h"
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
|
||||
#ifdef ARCH_IS_BIG_ENDIAN
|
||||
# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
|
||||
#else
|
||||
# define BYTE_ORDER 0
|
||||
#endif
|
||||
|
||||
#define T_MASK ((md5_word_t)~0)
|
||||
#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
|
||||
#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
|
||||
#define T3 0x242070db
|
||||
#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
|
||||
#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
|
||||
#define T6 0x4787c62a
|
||||
#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
|
||||
#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
|
||||
#define T9 0x698098d8
|
||||
#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
|
||||
#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
|
||||
#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
|
||||
#define T13 0x6b901122
|
||||
#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
|
||||
#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
|
||||
#define T16 0x49b40821
|
||||
#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
|
||||
#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
|
||||
#define T19 0x265e5a51
|
||||
#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
|
||||
#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
|
||||
#define T22 0x02441453
|
||||
#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
|
||||
#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
|
||||
#define T25 0x21e1cde6
|
||||
#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
|
||||
#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
|
||||
#define T28 0x455a14ed
|
||||
#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
|
||||
#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
|
||||
#define T31 0x676f02d9
|
||||
#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
|
||||
#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
|
||||
#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
|
||||
#define T35 0x6d9d6122
|
||||
#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
|
||||
#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
|
||||
#define T38 0x4bdecfa9
|
||||
#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
|
||||
#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
|
||||
#define T41 0x289b7ec6
|
||||
#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
|
||||
#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
|
||||
#define T44 0x04881d05
|
||||
#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
|
||||
#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
|
||||
#define T47 0x1fa27cf8
|
||||
#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
|
||||
#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
|
||||
#define T50 0x432aff97
|
||||
#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
|
||||
#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
|
||||
#define T53 0x655b59c3
|
||||
#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
|
||||
#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
|
||||
#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
|
||||
#define T57 0x6fa87e4f
|
||||
#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
|
||||
#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
|
||||
#define T60 0x4e0811a1
|
||||
#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
|
||||
#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
|
||||
#define T63 0x2ad7d2bb
|
||||
#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
|
||||
|
||||
|
||||
static void
|
||||
md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
|
||||
{
|
||||
md5_word_t
|
||||
a = pms->abcd[0], b = pms->abcd[1],
|
||||
c = pms->abcd[2], d = pms->abcd[3];
|
||||
md5_word_t t;
|
||||
#if BYTE_ORDER > 0
|
||||
/* Define storage only for big-endian CPUs. */
|
||||
md5_word_t X[16];
|
||||
#else
|
||||
/* Define storage for little-endian or both types of CPUs. */
|
||||
md5_word_t xbuf[16];
|
||||
const md5_word_t *X;
|
||||
#endif
|
||||
|
||||
{
|
||||
#if BYTE_ORDER == 0
|
||||
/*
|
||||
* Determine dynamically whether this is a big-endian or
|
||||
* little-endian machine, since we can use a more efficient
|
||||
* algorithm on the latter.
|
||||
*/
|
||||
static const int w = 1;
|
||||
|
||||
if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
|
||||
#endif
|
||||
#if BYTE_ORDER <= 0 /* little-endian */
|
||||
{
|
||||
/*
|
||||
* On little-endian machines, we can process properly aligned
|
||||
* data without copying it.
|
||||
*/
|
||||
if (!((data - (const md5_byte_t *)0) & 3)) {
|
||||
/* data are properly aligned */
|
||||
X = (const md5_word_t *)data;
|
||||
} else {
|
||||
/* not aligned */
|
||||
memcpy(xbuf, data, 64);
|
||||
X = xbuf;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if BYTE_ORDER == 0
|
||||
else /* dynamic big-endian */
|
||||
#endif
|
||||
#if BYTE_ORDER >= 0 /* big-endian */
|
||||
{
|
||||
/*
|
||||
* On big-endian machines, we must arrange the bytes in the
|
||||
* right order.
|
||||
*/
|
||||
const md5_byte_t *xp = data;
|
||||
int i;
|
||||
|
||||
# if BYTE_ORDER == 0
|
||||
X = xbuf; /* (dynamic only) */
|
||||
# else
|
||||
# define xbuf X /* (static only) */
|
||||
# endif
|
||||
for (i = 0; i < 16; ++i, xp += 4)
|
||||
xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
|
||||
/* Round 1. */
|
||||
/* Let [abcd k s i] denote the operation
|
||||
a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + F(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 0, 7, T1);
|
||||
SET(d, a, b, c, 1, 12, T2);
|
||||
SET(c, d, a, b, 2, 17, T3);
|
||||
SET(b, c, d, a, 3, 22, T4);
|
||||
SET(a, b, c, d, 4, 7, T5);
|
||||
SET(d, a, b, c, 5, 12, T6);
|
||||
SET(c, d, a, b, 6, 17, T7);
|
||||
SET(b, c, d, a, 7, 22, T8);
|
||||
SET(a, b, c, d, 8, 7, T9);
|
||||
SET(d, a, b, c, 9, 12, T10);
|
||||
SET(c, d, a, b, 10, 17, T11);
|
||||
SET(b, c, d, a, 11, 22, T12);
|
||||
SET(a, b, c, d, 12, 7, T13);
|
||||
SET(d, a, b, c, 13, 12, T14);
|
||||
SET(c, d, a, b, 14, 17, T15);
|
||||
SET(b, c, d, a, 15, 22, T16);
|
||||
#undef SET
|
||||
|
||||
/* Round 2. */
|
||||
/* Let [abcd k s i] denote the operation
|
||||
a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + G(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 1, 5, T17);
|
||||
SET(d, a, b, c, 6, 9, T18);
|
||||
SET(c, d, a, b, 11, 14, T19);
|
||||
SET(b, c, d, a, 0, 20, T20);
|
||||
SET(a, b, c, d, 5, 5, T21);
|
||||
SET(d, a, b, c, 10, 9, T22);
|
||||
SET(c, d, a, b, 15, 14, T23);
|
||||
SET(b, c, d, a, 4, 20, T24);
|
||||
SET(a, b, c, d, 9, 5, T25);
|
||||
SET(d, a, b, c, 14, 9, T26);
|
||||
SET(c, d, a, b, 3, 14, T27);
|
||||
SET(b, c, d, a, 8, 20, T28);
|
||||
SET(a, b, c, d, 13, 5, T29);
|
||||
SET(d, a, b, c, 2, 9, T30);
|
||||
SET(c, d, a, b, 7, 14, T31);
|
||||
SET(b, c, d, a, 12, 20, T32);
|
||||
#undef SET
|
||||
|
||||
/* Round 3. */
|
||||
/* Let [abcd k s t] denote the operation
|
||||
a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define H(x, y, z) ((x) ^ (y) ^ (z))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + H(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 5, 4, T33);
|
||||
SET(d, a, b, c, 8, 11, T34);
|
||||
SET(c, d, a, b, 11, 16, T35);
|
||||
SET(b, c, d, a, 14, 23, T36);
|
||||
SET(a, b, c, d, 1, 4, T37);
|
||||
SET(d, a, b, c, 4, 11, T38);
|
||||
SET(c, d, a, b, 7, 16, T39);
|
||||
SET(b, c, d, a, 10, 23, T40);
|
||||
SET(a, b, c, d, 13, 4, T41);
|
||||
SET(d, a, b, c, 0, 11, T42);
|
||||
SET(c, d, a, b, 3, 16, T43);
|
||||
SET(b, c, d, a, 6, 23, T44);
|
||||
SET(a, b, c, d, 9, 4, T45);
|
||||
SET(d, a, b, c, 12, 11, T46);
|
||||
SET(c, d, a, b, 15, 16, T47);
|
||||
SET(b, c, d, a, 2, 23, T48);
|
||||
#undef SET
|
||||
|
||||
/* Round 4. */
|
||||
/* Let [abcd k s t] denote the operation
|
||||
a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
|
||||
#define I(x, y, z) ((y) ^ ((x) | ~(z)))
|
||||
#define SET(a, b, c, d, k, s, Ti)\
|
||||
t = a + I(b,c,d) + X[k] + Ti;\
|
||||
a = ROTATE_LEFT(t, s) + b
|
||||
/* Do the following 16 operations. */
|
||||
SET(a, b, c, d, 0, 6, T49);
|
||||
SET(d, a, b, c, 7, 10, T50);
|
||||
SET(c, d, a, b, 14, 15, T51);
|
||||
SET(b, c, d, a, 5, 21, T52);
|
||||
SET(a, b, c, d, 12, 6, T53);
|
||||
SET(d, a, b, c, 3, 10, T54);
|
||||
SET(c, d, a, b, 10, 15, T55);
|
||||
SET(b, c, d, a, 1, 21, T56);
|
||||
SET(a, b, c, d, 8, 6, T57);
|
||||
SET(d, a, b, c, 15, 10, T58);
|
||||
SET(c, d, a, b, 6, 15, T59);
|
||||
SET(b, c, d, a, 13, 21, T60);
|
||||
SET(a, b, c, d, 4, 6, T61);
|
||||
SET(d, a, b, c, 11, 10, T62);
|
||||
SET(c, d, a, b, 2, 15, T63);
|
||||
SET(b, c, d, a, 9, 21, T64);
|
||||
#undef SET
|
||||
|
||||
/* Then perform the following additions. (That is increment each
|
||||
of the four registers by the value it had before this block
|
||||
was started.) */
|
||||
pms->abcd[0] += a;
|
||||
pms->abcd[1] += b;
|
||||
pms->abcd[2] += c;
|
||||
pms->abcd[3] += d;
|
||||
}
|
||||
|
||||
void
|
||||
md5_init(md5_state_t *pms)
|
||||
{
|
||||
pms->count[0] = pms->count[1] = 0;
|
||||
pms->abcd[0] = 0x67452301;
|
||||
pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
|
||||
pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
|
||||
pms->abcd[3] = 0x10325476;
|
||||
}
|
||||
|
||||
void
|
||||
md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
|
||||
{
|
||||
const md5_byte_t *p = data;
|
||||
int left = nbytes;
|
||||
int offset = (pms->count[0] >> 3) & 63;
|
||||
md5_word_t nbits = (md5_word_t)(nbytes << 3);
|
||||
|
||||
if (nbytes <= 0)
|
||||
return;
|
||||
|
||||
/* Update the message length. */
|
||||
pms->count[1] += nbytes >> 29;
|
||||
pms->count[0] += nbits;
|
||||
if (pms->count[0] < nbits)
|
||||
pms->count[1]++;
|
||||
|
||||
/* Process an initial partial block. */
|
||||
if (offset) {
|
||||
int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
|
||||
|
||||
memcpy(pms->buf + offset, p, copy);
|
||||
if (offset + copy < 64)
|
||||
return;
|
||||
p += copy;
|
||||
left -= copy;
|
||||
md5_process(pms, pms->buf);
|
||||
}
|
||||
|
||||
/* Process full blocks. */
|
||||
for (; left >= 64; p += 64, left -= 64)
|
||||
md5_process(pms, p);
|
||||
|
||||
/* Process a final partial block. */
|
||||
if (left)
|
||||
memcpy(pms->buf, p, left);
|
||||
}
|
||||
|
||||
void
|
||||
md5_finish(md5_state_t *pms, md5_byte_t digest[16])
|
||||
{
|
||||
static const md5_byte_t pad[64] = {
|
||||
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
md5_byte_t data[8];
|
||||
int i;
|
||||
|
||||
/* Save the length before padding. */
|
||||
for (i = 0; i < 8; ++i)
|
||||
data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
|
||||
/* Pad to 56 bytes mod 64. */
|
||||
md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
|
||||
/* Append the length. */
|
||||
md5_append(pms, data, 8);
|
||||
for (i = 0; i < 16; ++i)
|
||||
digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
|
||||
}
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
/*
|
||||
Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
L. Peter Deutsch
|
||||
ghost@aladdin.com
|
||||
|
||||
*/
|
||||
/* $Id: md5.h,v 1.1 2010-08-13 10:50:08 degironc Exp $ */
|
||||
/*
|
||||
Independent implementation of MD5 (RFC 1321).
|
||||
|
||||
This code implements the MD5 Algorithm defined in RFC 1321, whose
|
||||
text is available at
|
||||
http://www.ietf.org/rfc/rfc1321.txt
|
||||
The code is derived from the text of the RFC, including the test suite
|
||||
(section A.5) but excluding the rest of Appendix A. It does not include
|
||||
any code or documentation that is identified in the RFC as being
|
||||
copyrighted.
|
||||
|
||||
The original and principal author of md5.h is L. Peter Deutsch
|
||||
<ghost@aladdin.com>. Other authors are noted in the change history
|
||||
that follows (in reverse chronological order):
|
||||
|
||||
2002-04-13 lpd Removed support for non-ANSI compilers; removed
|
||||
references to Ghostscript; clarified derivation from RFC 1321;
|
||||
now handles byte order either statically or dynamically.
|
||||
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
|
||||
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
|
||||
added conditionalization for C++ compilation from Martin
|
||||
Purschke <purschke@bnl.gov>.
|
||||
1999-05-03 lpd Original version.
|
||||
*/
|
||||
|
||||
#ifndef md5_INCLUDED
|
||||
# define md5_INCLUDED
|
||||
|
||||
/*
|
||||
* This package supports both compile-time and run-time determination of CPU
|
||||
* byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
|
||||
* compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
|
||||
* defined as non-zero, the code will be compiled to run only on big-endian
|
||||
* CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
|
||||
* run on either big- or little-endian CPUs, but will run slightly less
|
||||
* efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
|
||||
*/
|
||||
|
||||
typedef unsigned char md5_byte_t; /* 8-bit byte */
|
||||
typedef unsigned int md5_word_t; /* 32-bit word */
|
||||
|
||||
/* Define the state of the MD5 Algorithm. */
|
||||
typedef struct md5_state_s {
|
||||
md5_word_t count[2]; /* message length in bits, lsw first */
|
||||
md5_word_t abcd[4]; /* digest buffer */
|
||||
md5_byte_t buf[64]; /* accumulate block */
|
||||
} md5_state_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/* Initialize the algorithm. */
|
||||
void md5_init(md5_state_t *pms);
|
||||
|
||||
/* Append a string to the message. */
|
||||
void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
|
||||
|
||||
/* Finish the message and return the digest. */
|
||||
void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* end extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* md5_INCLUDED */
|
||||
|
|
@ -47,7 +47,7 @@ GlueBoolGroup oplc_bool_output_vars[] = {\n\
|
|||
#define GLUE_PREFIX "/// The size of the array of glue variables.\n"
|
||||
|
||||
|
||||
SCENARIO("Commmand line", "[main]") {
|
||||
SCENARIO("Command line", "[main]") {
|
||||
GIVEN("<no pre-conditions>") {
|
||||
WHEN("-h command line arguments") {
|
||||
const char* args[2] = { "glue_generator", "-h" };
|
||||
|
|
@ -64,9 +64,11 @@ SCENARIO("Commmand line", "[main]") {
|
|||
SCENARIO("", "") {
|
||||
GIVEN("IO as streams") {
|
||||
std::stringstream output_stream;
|
||||
md5_byte_t digest[16];
|
||||
|
||||
WHEN("Contains single BOOL at %IX0") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(BOOL,__IX0,I,X,0)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
|
||||
const char* expected = PREFIX "\tbool_input[0][0] = __IX0;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
|
|
@ -79,7 +81,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single BOOL at %QX0") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(BOOL,__QX0,Q,X,0)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tbool_output[0][0] = __QX0;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -91,7 +93,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single BYTE at %IB0") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(BYTE,__IB0,I,B,0)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX"\tbyte_input[0] = __IB0;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -103,7 +105,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single SINT at %IB1") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(SINT,__IB1,I,B,1)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tbyte_input[1] = __IB1;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -115,7 +117,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single SINT at %QB1") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(SINT,__QB1,Q,B,1)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tbyte_output[1] = __QB1;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -127,7 +129,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single USINT at %IB2") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(USINT,__IB2,I,B,2)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tbyte_input[2] = __IB2;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -139,7 +141,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single WORD at %IW0") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(WORD,__IW0,I,W,0)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tint_input[0] = __IW0;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -151,7 +153,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single WORD at %QW0") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(WORD,__QW0,Q,W,0)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tint_output[0] = __QW0;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -163,7 +165,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single INT at %IW1") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(INT,__IW1,I,W,1)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tint_input[1] = __IW1;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -175,7 +177,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single UINT at %IW2") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(UINT,__IW2,I,W,2)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
|
||||
const char* expected = PREFIX "\tint_input[2] = __IW2;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
|
|
@ -188,7 +190,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains two REAL at %ID0 and %ID10") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(REAL,__ID0,I,D,0)\n__LOCATED_VAR(REAL,__ID10,I,D,10)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
|
||||
// Note that the type-separate glue does not support REAL types
|
||||
const char* expected = PREFIX POSTFIX GLUE_PREFIX\
|
||||
|
|
@ -203,7 +205,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single INT at %MW2") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(INT,__MW2,M,W,2)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tint_memory[2] = __MW2;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -215,7 +217,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single DWORD at %MD0") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(DWORD,__MD2,M,D,2)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tdint_memory[2] = (IEC_DINT *)__MD2;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -227,7 +229,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single LINT at %ML1") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(LINT,__ML1,M,L,1)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tlint_memory[1] = (IEC_LINT *)__ML1;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
@ -239,7 +241,7 @@ extern const GlueVariable oplc_glue_vars[] = {\n\
|
|||
|
||||
WHEN("Contains single LINT at %ML1024") {
|
||||
std::stringstream input_stream("__LOCATED_VAR(LINT,__ML1024,M,L,1024)");
|
||||
generateBody(input_stream, output_stream);
|
||||
generateBody(input_stream, output_stream, digest);
|
||||
const char* expected = PREFIX "\tspecial_functions[0] = (IEC_LINT *)__ML1024;\n" POSTFIX GLUE_PREFIX\
|
||||
"extern std::uint16_t const OPLCGLUE_GLUE_SIZE(1);\n\
|
||||
/// The packed glue variables.\n\
|
||||
|
|
|
|||
Loading…
Reference in New Issue