From b7f694142abbed2292b749c326ab9558f3692ceb Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 7 Sep 2021 14:10:50 +0200 Subject: [PATCH] replaced md5 in client --- slsDetectorSoftware/src/Detector.cpp | 5 +- slsDetectorSoftware/src/DetectorImpl.cpp | 30 +--- slsDetectorSoftware/src/DetectorImpl.h | 4 +- slsDetectorSoftware/src/Module.cpp | 18 +- slsDetectorSoftware/src/Module.h | 5 +- slsSupportLib/opensslMd5/LICENSE | 202 +++++++++++++++++++++++ 6 files changed, 217 insertions(+), 47 deletions(-) create mode 100644 slsSupportLib/opensslMd5/LICENSE diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 60cc07e4c..3e316e984 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -2140,9 +2140,8 @@ void Detector::setAdditionalJsonParameter(const std::string &key, // Advanced void Detector::programFPGA(const std::string &fname, Positions pos) { - std::string checksum; - std::vector buffer = pimpl->readProgrammingFile(fname, checksum); - pimpl->Parallel(&Module::programFPGA, pos, buffer, checksum); + std::vector buffer = pimpl->readProgrammingFile(fname); + pimpl->Parallel(&Module::programFPGA, pos, buffer); } void Detector::resetFPGA(Positions pos) { diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index b534257c4..8d7249ca9 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1240,8 +1240,7 @@ int DetectorImpl::kbhit() { return FD_ISSET(STDIN_FILENO, &fds); } -std::vector DetectorImpl::readProgrammingFile(const std::string &fname, - std::string &checksum) { +std::vector DetectorImpl::readProgrammingFile(const std::string &fname) { // validate type of file bool isPof = false; switch (multi_shm()->multiDetectorType) { @@ -1390,39 +1389,12 @@ std::vector DetectorImpl::readProgrammingFile(const std::string &fname, "Program FPGA: Could not close destination file after converting"); } - // calculate checksum before deleting file - checksum = getMd5Checksum(destfname); - unlink(destfname); // delete temporary file LOG(logDEBUG1) << "Successfully loaded the rawbin file to program memory"; LOG(logINFO) << "Read file into memory"; return buffer; } -std::string DetectorImpl::getMd5Checksum(const std::string &fname) { - std::string cmd = "md5sum " + fname; - FILE *pipe = popen(cmd.c_str(), "r"); - if (!pipe) { - throw RuntimeError("Could not get md5 checksum to program fpga"); - } - char buffer[256]; - memset(buffer, 0, sizeof(buffer)); - std::string result; - try { - while (fgets(buffer, sizeof buffer, pipe) != NULL) { - result += buffer; - } - } catch (std::exception &e) { - pclose(pipe); - throw RuntimeError( - std::string("Could not get md5 checsum to program fpga. Threw ") + - std::string(e.what())); - } - pclose(pipe); - auto list = sls::split(result, ' '); - return list[0]; -} - sls::Result DetectorImpl::getNumberofUDPInterfaces(Positions pos) const { return Parallel(&Module::getNumberofUDPInterfaces, pos); } diff --git a/slsDetectorSoftware/src/DetectorImpl.h b/slsDetectorSoftware/src/DetectorImpl.h index 319f5153c..8dd8f519b 100644 --- a/slsDetectorSoftware/src/DetectorImpl.h +++ b/slsDetectorSoftware/src/DetectorImpl.h @@ -289,9 +289,7 @@ class DetectorImpl : public virtual slsDetectorDefs { * @param fname name of pof/rbf file * @returns binary of the program */ - std::vector readProgrammingFile(const std::string &fname, - std::string &checksum); - std::string getMd5Checksum(const std::string &fname); + std::vector readProgrammingFile(const std::string &fname); sls::Result getNumberofUDPInterfaces(Positions pos) const; void setNumberofUDPInterfaces(int n, Positions pos); diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 6c521a4c6..390ece438 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -2485,13 +2485,12 @@ void Module::setAdditionalJsonParameter(const std::string &key, } // Advanced -void Module::programFPGA(std::vector buffer, - const std::string &checksum) { +void Module::programFPGA(std::vector buffer) { switch (shm()->myDetectorType) { case JUNGFRAU: case CHIPTESTBOARD: case MOENCH: - programFPGAviaBlackfin(buffer, checksum); + programFPGAviaBlackfin(buffer); break; case MYTHEN3: case GOTTHARD2: @@ -3418,15 +3417,16 @@ std::string Module::calculateChecksum(char *buffer, ssize_t bytes) { MD5_Update(&c, buffer, bytes); unsigned char out[MD5_DIGEST_LENGTH]; MD5_Final(out, &c); - return std::string(reinterpret_cast(out)); + 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 buffer, - const std::string &checksum) { +void Module::programFPGAviaBlackfin(std::vector buffer) { uint64_t filesize = buffer.size(); - LOG(logINFOBLUE) << "checksum 1:" << checksum; - LOG(logINFOBLUE) << "checksum 2:" - << calculateChecksum(buffer.data(), filesize); + std::string checksum = calculateChecksum(buffer.data(), filesize); + LOG(logDEBUG1) << "Checksum:" << checksum; // send program from memory to detector LOG(logINFO) << "Sending programming binary (from pof) to module " diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index a36c757d3..d2bbe47f1 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -535,7 +535,7 @@ class Module : public virtual slsDetectorDefs { * Advanced * * * * ************************************************/ - void programFPGA(std::vector buffer, const std::string &checksum); + void programFPGA(std::vector buffer); void resetFPGA(); void copyDetectorServer(const std::string &fname, const std::string &hostname); @@ -745,8 +745,7 @@ class Module : public virtual slsDetectorDefs { sls_detector_module readSettingsFile(const std::string &fname, bool trimbits = true); std::string calculateChecksum(char *buffer, ssize_t bytes); - void programFPGAviaBlackfin(std::vector buffer, - const std::string &checksum); + void programFPGAviaBlackfin(std::vector buffer); void programFPGAviaNios(std::vector buffer); const int moduleId; diff --git a/slsSupportLib/opensslMd5/LICENSE b/slsSupportLib/opensslMd5/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/slsSupportLib/opensslMd5/LICENSE @@ -0,0 +1,202 @@ + + 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.