From eadc222ff9087c8dd41a7afced717a65802e849c Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Mon, 4 Nov 2019 09:26:43 -0500 Subject: Rename SHA2 implementation (non-bisectable) --- libqpdf/Pl_SHA2.cc | 158 -------------------------------------------- libqpdf/SHA2_native.cc | 158 ++++++++++++++++++++++++++++++++++++++++++++ libqpdf/qpdf/Pl_SHA2.hh | 50 -------------- libqpdf/qpdf/SHA2_native.hh | 50 ++++++++++++++ 4 files changed, 208 insertions(+), 208 deletions(-) delete mode 100644 libqpdf/Pl_SHA2.cc create mode 100644 libqpdf/SHA2_native.cc delete mode 100644 libqpdf/qpdf/Pl_SHA2.hh create mode 100644 libqpdf/qpdf/SHA2_native.hh (limited to 'libqpdf') diff --git a/libqpdf/Pl_SHA2.cc b/libqpdf/Pl_SHA2.cc deleted file mode 100644 index 17eff7e3..00000000 --- a/libqpdf/Pl_SHA2.cc +++ /dev/null @@ -1,158 +0,0 @@ -#include -#include -#include -#include -#include - -Pl_SHA2::Pl_SHA2(int bits, Pipeline* next) : - Pipeline("sha2", next), - in_progress(false), - bits(0) -{ - if (bits) - { - resetBits(bits); - } -} - -Pl_SHA2::~Pl_SHA2() -{ -} - -void -Pl_SHA2::badBits() -{ - throw std::logic_error("Pl_SHA2 has unexpected value for bits"); -} - -void -Pl_SHA2::write(unsigned char* buf, size_t len) -{ - if (! this->in_progress) - { - switch (bits) - { - case 256: - sph_sha256_init(&this->ctx256); - break; - case 384: - sph_sha384_init(&this->ctx384); - break; - case 512: - sph_sha512_init(&this->ctx512); - break; - default: - badBits(); - break; - } - this->in_progress = true; - } - - // Write in chunks in case len is too big to fit in an int. - // Assume int is at least 32 bits. - static size_t const max_bytes = 1 << 30; - size_t bytes_left = len; - unsigned char* data = buf; - while (bytes_left > 0) - { - size_t bytes = (bytes_left >= max_bytes ? max_bytes : bytes_left); - switch (bits) - { - case 256: - sph_sha256(&this->ctx256, data, bytes); - break; - case 384: - sph_sha384(&this->ctx384, data, bytes); - break; - case 512: - sph_sha512(&this->ctx512, data, bytes); - break; - default: - badBits(); - break; - } - bytes_left -= bytes; - data += bytes; - } - - if (this->getNext(true)) - { - this->getNext()->write(buf, len); - } -} - -void -Pl_SHA2::finish() -{ - if (this->getNext(true)) - { - this->getNext()->finish(); - } - switch (bits) - { - case 256: - sph_sha256_close(&this->ctx256, sha256sum); - break; - case 384: - sph_sha384_close(&this->ctx384, sha384sum); - break; - case 512: - sph_sha512_close(&this->ctx512, sha512sum); - break; - default: - badBits(); - break; - } - this->in_progress = false; -} - -void -Pl_SHA2::resetBits(int bits) -{ - if (this->in_progress) - { - throw std::logic_error( - "bit reset requested for in-progress SHA2 Pipeline"); - } - if (! ((bits == 256) || (bits == 384) || (bits == 512))) - { - throw std::logic_error("Pl_SHA2 called with bits != 256, 384, or 512"); - } - this->bits = bits; -} - -std::string -Pl_SHA2::getRawDigest() -{ - std::string result; - switch (bits) - { - case 256: - result = std::string(reinterpret_cast(this->sha256sum), - sizeof(this->sha256sum)); - break; - case 384: - result = std::string(reinterpret_cast(this->sha384sum), - sizeof(this->sha384sum)); - break; - case 512: - result = std::string(reinterpret_cast(this->sha512sum), - sizeof(this->sha512sum)); - break; - default: - badBits(); - break; - } - return result; -} - -std::string -Pl_SHA2::getHexDigest() -{ - if (this->in_progress) - { - throw std::logic_error( - "digest requested for in-progress SHA2 Pipeline"); - } - return QUtil::hex_encode(getRawDigest()); -} diff --git a/libqpdf/SHA2_native.cc b/libqpdf/SHA2_native.cc new file mode 100644 index 00000000..17eff7e3 --- /dev/null +++ b/libqpdf/SHA2_native.cc @@ -0,0 +1,158 @@ +#include +#include +#include +#include +#include + +Pl_SHA2::Pl_SHA2(int bits, Pipeline* next) : + Pipeline("sha2", next), + in_progress(false), + bits(0) +{ + if (bits) + { + resetBits(bits); + } +} + +Pl_SHA2::~Pl_SHA2() +{ +} + +void +Pl_SHA2::badBits() +{ + throw std::logic_error("Pl_SHA2 has unexpected value for bits"); +} + +void +Pl_SHA2::write(unsigned char* buf, size_t len) +{ + if (! this->in_progress) + { + switch (bits) + { + case 256: + sph_sha256_init(&this->ctx256); + break; + case 384: + sph_sha384_init(&this->ctx384); + break; + case 512: + sph_sha512_init(&this->ctx512); + break; + default: + badBits(); + break; + } + this->in_progress = true; + } + + // Write in chunks in case len is too big to fit in an int. + // Assume int is at least 32 bits. + static size_t const max_bytes = 1 << 30; + size_t bytes_left = len; + unsigned char* data = buf; + while (bytes_left > 0) + { + size_t bytes = (bytes_left >= max_bytes ? max_bytes : bytes_left); + switch (bits) + { + case 256: + sph_sha256(&this->ctx256, data, bytes); + break; + case 384: + sph_sha384(&this->ctx384, data, bytes); + break; + case 512: + sph_sha512(&this->ctx512, data, bytes); + break; + default: + badBits(); + break; + } + bytes_left -= bytes; + data += bytes; + } + + if (this->getNext(true)) + { + this->getNext()->write(buf, len); + } +} + +void +Pl_SHA2::finish() +{ + if (this->getNext(true)) + { + this->getNext()->finish(); + } + switch (bits) + { + case 256: + sph_sha256_close(&this->ctx256, sha256sum); + break; + case 384: + sph_sha384_close(&this->ctx384, sha384sum); + break; + case 512: + sph_sha512_close(&this->ctx512, sha512sum); + break; + default: + badBits(); + break; + } + this->in_progress = false; +} + +void +Pl_SHA2::resetBits(int bits) +{ + if (this->in_progress) + { + throw std::logic_error( + "bit reset requested for in-progress SHA2 Pipeline"); + } + if (! ((bits == 256) || (bits == 384) || (bits == 512))) + { + throw std::logic_error("Pl_SHA2 called with bits != 256, 384, or 512"); + } + this->bits = bits; +} + +std::string +Pl_SHA2::getRawDigest() +{ + std::string result; + switch (bits) + { + case 256: + result = std::string(reinterpret_cast(this->sha256sum), + sizeof(this->sha256sum)); + break; + case 384: + result = std::string(reinterpret_cast(this->sha384sum), + sizeof(this->sha384sum)); + break; + case 512: + result = std::string(reinterpret_cast(this->sha512sum), + sizeof(this->sha512sum)); + break; + default: + badBits(); + break; + } + return result; +} + +std::string +Pl_SHA2::getHexDigest() +{ + if (this->in_progress) + { + throw std::logic_error( + "digest requested for in-progress SHA2 Pipeline"); + } + return QUtil::hex_encode(getRawDigest()); +} diff --git a/libqpdf/qpdf/Pl_SHA2.hh b/libqpdf/qpdf/Pl_SHA2.hh deleted file mode 100644 index 0748dd0b..00000000 --- a/libqpdf/qpdf/Pl_SHA2.hh +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef PL_SHA2_HH -#define PL_SHA2_HH - -// Bits must be a supported number of bits, currently only 256, 384, -// or 512. Passing 0 as bits leaves the pipeline uncommitted, in -// which case resetBits must be called before the pipeline is used. -// If a next is provided, this pipeline sends its output to its -// successor unmodified. After calling finish, the SHA2 checksum of -// the data that passed through the pipeline is available. - -// This pipeline is reusable; i.e., it is safe to call write() after -// calling finish(). The first call to write() after a call to -// finish() initializes a new SHA2 object. resetBits may also be -// called between finish and the next call to write. - -#include -#include - -class Pl_SHA2: public Pipeline -{ - public: - QPDF_DLL - Pl_SHA2(int bits = 0, Pipeline* next = 0); - QPDF_DLL - virtual ~Pl_SHA2(); - QPDF_DLL - virtual void write(unsigned char*, size_t); - QPDF_DLL - virtual void finish(); - QPDF_DLL - void resetBits(int bits); - QPDF_DLL - std::string getHexDigest(); - QPDF_DLL - std::string getRawDigest(); - - private: - void badBits(); - - bool in_progress; - int bits; - sph_sha256_context ctx256; - sph_sha384_context ctx384; - sph_sha512_context ctx512; - unsigned char sha256sum[32]; - unsigned char sha384sum[48]; - unsigned char sha512sum[64]; -}; - -#endif // PL_SHA2_HH diff --git a/libqpdf/qpdf/SHA2_native.hh b/libqpdf/qpdf/SHA2_native.hh new file mode 100644 index 00000000..0748dd0b --- /dev/null +++ b/libqpdf/qpdf/SHA2_native.hh @@ -0,0 +1,50 @@ +#ifndef PL_SHA2_HH +#define PL_SHA2_HH + +// Bits must be a supported number of bits, currently only 256, 384, +// or 512. Passing 0 as bits leaves the pipeline uncommitted, in +// which case resetBits must be called before the pipeline is used. +// If a next is provided, this pipeline sends its output to its +// successor unmodified. After calling finish, the SHA2 checksum of +// the data that passed through the pipeline is available. + +// This pipeline is reusable; i.e., it is safe to call write() after +// calling finish(). The first call to write() after a call to +// finish() initializes a new SHA2 object. resetBits may also be +// called between finish and the next call to write. + +#include +#include + +class Pl_SHA2: public Pipeline +{ + public: + QPDF_DLL + Pl_SHA2(int bits = 0, Pipeline* next = 0); + QPDF_DLL + virtual ~Pl_SHA2(); + QPDF_DLL + virtual void write(unsigned char*, size_t); + QPDF_DLL + virtual void finish(); + QPDF_DLL + void resetBits(int bits); + QPDF_DLL + std::string getHexDigest(); + QPDF_DLL + std::string getRawDigest(); + + private: + void badBits(); + + bool in_progress; + int bits; + sph_sha256_context ctx256; + sph_sha384_context ctx384; + sph_sha512_context ctx512; + unsigned char sha256sum[32]; + unsigned char sha384sum[48]; + unsigned char sha512sum[64]; +}; + +#endif // PL_SHA2_HH -- cgit v1.2.3-54-g00ecf