Revert "remove libcheckisomd5"

This reverts commit 523805f1d2.
This commit is contained in:
Dmitry Degtyarev 2022-04-14 10:46:16 +04:00
parent 64c099001e
commit 3780d3055a
13 changed files with 579 additions and 2 deletions

View File

@ -6,6 +6,7 @@ TARGET = $$MEDIAWRITER_NAME
QT += qml quick widgets network
LIBS += -lisomd5
linux {
LIBS += -lyaml-cpp
}

View File

@ -75,6 +75,19 @@ WriteJob::WriteJob(const QString &what, const QString &where)
QTimer::singleShot(0, this, SLOT(work()));
}
int WriteJob::staticOnMediaCheckAdvanced(void *data, long long offset, long long total) {
return ((WriteJob*)data)->onMediaCheckAdvanced(offset, total);
}
int WriteJob::onMediaCheckAdvanced(long long offset, long long total) {
QTextStream out(stdout);
Q_UNUSED(total);
out << offset << "\n";
out.flush();
return 0;
}
QDBusUnixFileDescriptor WriteJob::getDescriptor() {
QTextStream err(stderr);

View File

@ -45,6 +45,9 @@ class WriteJob : public QObject {
public:
explicit WriteJob(const QString &what, const QString &where);
static int staticOnMediaCheckAdvanced(void *data, long long offset, long long total);
int onMediaCheckAdvanced(long long offset, long long total);
QDBusUnixFileDescriptor getDescriptor();
bool write(int fd);
bool writeCompressed(int fd);

View File

@ -4,7 +4,7 @@ include($$top_srcdir/deployment.pri)
QT += core network
LIBS += -llzma
LIBS += -lisomd5 -llzma
CONFIG += c++11
CONFIG += console

View File

@ -50,6 +50,19 @@ WriteJob::WriteJob(const QString &what, const QString &where)
QTimer::singleShot(0, this, &WriteJob::work);
}
int WriteJob::staticOnMediaCheckAdvanced(void *data, long long offset, long long total) {
return ((WriteJob*)data)->onMediaCheckAdvanced(offset, total);
}
int WriteJob::onMediaCheckAdvanced(long long offset, long long total) {
QTextStream out(stdout);
Q_UNUSED(total);
out << offset << "\n";
out.flush();
return 0;
}
HANDLE WriteJob::openDrive(int physicalDriveNumber) {
QTextStream err(stderr);

View File

@ -38,6 +38,9 @@ class WriteJob : public QObject {
public:
explicit WriteJob(const QString &what, const QString &where);
static int staticOnMediaCheckAdvanced(void *data, long long offset, long long total);
int onMediaCheckAdvanced(long long offset, long long total);
private:
HANDLE openDrive(int physicalDriveNumber);
bool lockDrive(HANDLE drive);

13
lib/isomd5/isomd5.pro Normal file
View File

@ -0,0 +1,13 @@
TEMPLATE = lib
CONFIG += staticlib
DESTDIR = ../
HEADERS += libcheckisomd5.h \
md5.h
SOURCES += libcheckisomd5.c \
md5.c
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9

198
lib/isomd5/libcheckisomd5.c Normal file
View File

@ -0,0 +1,198 @@
/*
* Copyright (C) 2001-2013 Red Hat, Inc.
*
* Michael Fulbright <msf@redhat.com>
* Dustin Kirkland <dustin.dirkland@gmail.com>
* Added support for checkpoint fragment sums;
* Exits media check as soon as bad fragment md5sum'ed
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#define _LARGEFILE64_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
#include <inttypes.h>
#include "md5.h"
#include "libcheckisomd5.h"
#ifdef __APPLE__
#define lseek64 lseek
#endif
#ifdef _WIN32
size_t getpagesize () {
return 2048; // not really necessary for Windows
}
#endif
#define BUFSIZE 32768
#define SIZE_OFFSET 84
#define MAX(x, y) ((x > y) ? x : y)
#define MIN(x, y) ((x < y) ? x : y)
char libcheckisomd5_last_computedsum[MD5_DIGEST_LENGTH * 2 + 1];
char libcheckisomd5_last_mediasum[MD5_DIGEST_LENGTH * 2 + 1];
static int checkmd5sum(int fd, const char *mediasum, checkCallback cb, void *cbdata, long long size) {
// Md5 is empty, therefore md5 check not needed
if (mediasum[0] == '\0') {
return ISOMD5SUM_CHECK_PASSED;
}
int pagesize = getpagesize();
unsigned char *buf_unaligned = (unsigned char *) malloc((BUFSIZE + pagesize) * sizeof(unsigned char));
unsigned char *buf = (buf_unaligned + (pagesize - ((uintptr_t) buf_unaligned % pagesize)));
// Rewind
long long offset = lseek64(fd, 0LL, SEEK_SET);
// Compute md5
MD5_CTX md5ctx;
MD5_Init(&md5ctx);
if (cb) {
cb(cbdata, 0, size);
}
while (offset < size) {
ssize_t nattempt = MIN(size - offset, BUFSIZE);
ssize_t nread = read(fd, buf, nattempt);
if (nread <= 0)
break;
if (nread > nattempt) {
nread = nattempt;
lseek64(fd, offset + nread, SEEK_SET);
}
MD5_Update(&md5ctx, buf, nread);
offset = offset + nread;
if (cb && offset / nread % 256 == 0) {
if (cb(cbdata, offset, size)) {
free(buf_unaligned);
return ISOMD5SUM_CHECK_ABORTED;
}
}
}
if (cb) {
cb(cbdata, size, size);
}
free(buf_unaligned);
unsigned char computedsum_raw[MD5_DIGEST_LENGTH];
MD5_Final(computedsum_raw, &md5ctx);
// Convert computedsum to ascii string (mediasum is in ascii)
char computedsum[MD5_DIGEST_LENGTH * 2 + 1];
*computedsum = '\0';
for (int i = 0; i < MD5_DIGEST_LENGTH; i++) {
char tmpstr[4];
snprintf(tmpstr, 4, "%02x", computedsum_raw[i]);
strncat(computedsum, tmpstr, 2);
}
// printf("computedsum=%s\n", computedsum);
// printf("mediasum=%s\n", mediasum);
// Save sums for debug purposes
memcpy(libcheckisomd5_last_mediasum, mediasum, sizeof(libcheckisomd5_last_mediasum) * sizeof(char));
memcpy(libcheckisomd5_last_computedsum, computedsum, sizeof(libcheckisomd5_last_computedsum) * sizeof(char));
if (strcmp(mediasum, computedsum) == 0) {
return ISOMD5SUM_CHECK_PASSED;
} else {
return ISOMD5SUM_CHECK_FAILED;
}
}
int mediaCheckFile(const char *file, const char *md5,checkCallback cb, void *cbdata) {
int fd;
#ifdef _WIN32
fd = open(file, O_RDONLY | O_BINARY);
#else
fd = open(file, O_RDONLY);
#endif
if (fd < 0) {
return ISOMD5SUM_FILE_NOT_FOUND;
}
// Calculate file size
long long size = lseek64(fd, 0L, SEEK_END);
int rc = checkmd5sum(fd, md5, cb, cbdata, size);
close(fd);
return rc;
}
int mediaCheckFD(int fd, const char *md5, checkCallback cb, void *cbdata) {
if (fd < 0) {
return ISOMD5SUM_FILE_NOT_FOUND;
}
// NOTE: files that are FD(written to drive) are implicitly always iso's
// Get size
int pagesize = getpagesize();
unsigned char *buf_unaligned = (unsigned char *) malloc((BUFSIZE + pagesize) * sizeof(unsigned char));
unsigned char *buf = (buf_unaligned + (pagesize - ((uintptr_t) buf_unaligned % pagesize)));
if (lseek64(fd, (16LL * 2048LL), SEEK_SET) == -1) {
goto fail;
}
long long offset = (16LL * 2048LL);
for (;1;) {
if (read(fd, buf, 2048) <= 0) {
goto fail;
}
if (buf[0] == 1) {
/* found primary volume descriptor */
break;
} else if (buf[0] == 255) {
/* hit end and didn't find primary volume descriptor */
goto fail;
}
offset += 2048LL;
}
// Get size from pvd
long long size = (buf[SIZE_OFFSET] * 0x1000000 + buf[SIZE_OFFSET + 1] * 0x10000 + buf[SIZE_OFFSET + 2] * 0x100 + buf[SIZE_OFFSET + 3]) * 2048LL;
free(buf_unaligned);
int rc = checkmd5sum(fd, md5, cb, cbdata, size);
return rc;
fail:
free(buf_unaligned);
return ISOMD5SUM_CHECK_NOT_FOUND;
}

View File

@ -0,0 +1,29 @@
#ifndef __LIBCHECKISOMD5_H__
#define __LIBCHECKISOMD5_H__
#ifdef __cplusplus
extern "C" {
#endif
#define ISOMD5SUM_CHECK_PASSED 1
#define ISOMD5SUM_CHECK_FAILED 0
#define ISOMD5SUM_CHECK_ABORTED 2
#define ISOMD5SUM_CHECK_NOT_FOUND -1
#define ISOMD5SUM_FILE_NOT_FOUND -2
#define MD5_DIGEST_LENGTH 16
extern char libcheckisomd5_last_computedsum[MD5_DIGEST_LENGTH * 2 + 1];
extern char libcheckisomd5_last_mediasum[MD5_DIGEST_LENGTH * 2 + 1];
/* for non-zero return value, check is aborted */
typedef int (*checkCallback)(void *, long long offset, long long total);
int mediaCheckFile(const char *iso, const char *md5, checkCallback cb, void *cbdata);
int mediaCheckFD(int fd, const char *md5, checkCallback cb, void *cbdata);
int printMD5SUM(char *file);
#ifdef __cplusplus
}
#endif
#endif

270
lib/isomd5/md5.c Normal file
View File

@ -0,0 +1,270 @@
/*
* This code implements the MD5 message-digest algorithm.
* The algorithm is due to Ron Rivest. This code was
* written by Colin Plumb in 1993, no copyright is claimed.
* This code is in the public domain; do with it what you wish.
*
* Equivalent code is available from RSA Data Security, Inc.
* This code has been tested against that, and is equivalent,
* except that you don't need to include two pages of legalese
* with every copy.
*
* To compute the message digest of a chunk of bytes, declare an
* MD5Context structure, pass it to MD5Init, call MD5Update as
* needed on buffers full of bytes, and then call MD5Final, which
* will fill a supplied 16-byte array with the digest.
*
* Modified 12 June 2003 Jeremy Katz <katzj@redhat.com> to handle
* endianness better
* Modified Sep 01 Martin Bříza <mbriza@redhat.com> to handle
* endianness in a portable manner
*
*/
#include <string.h>
#include "md5.h"
void MD5_Transform(uint32 *buf, uint32 const *in);
volatile union {
uint32_t i;
char c[4];
} endianTest = { 0x01000000 };
#define IS_BIG_ENDIAN() (endianTest.c[0])
#define IS_LITTLE_ENDIAN() (endianTest.c[3])
static void byteReverse(unsigned char *buf, unsigned longs);
#ifndef ASM_MD5
/*
* Note: this code is harmless on little-endian machines.
*/
static void byteReverse(unsigned char *buf, unsigned longs)
{
uint32 t;
do {
t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
((unsigned) buf[1] << 8 | buf[0]);
*(uint32 *) buf = t;
buf += 4;
} while (--longs);
}
#endif
/*
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
* initialization constants.
*/
void MD5_Init(struct MD5Context *ctx)
{
ctx->buf[0] = 0x67452301U;
ctx->buf[1] = 0xefcdab89U;
ctx->buf[2] = 0x98badcfeU;
ctx->buf[3] = 0x10325476U;
ctx->bits[0] = 0;
ctx->bits[1] = 0;
if (IS_BIG_ENDIAN())
ctx->doByteReverse = 1;
else
ctx->doByteReverse = 0;
}
/*
* Update context to reflect the concatenation of another buffer full
* of bytes.
*/
void MD5_Update(struct MD5Context *ctx, unsigned const char *buf, unsigned len)
{
uint32 t;
/* Update bitcount */
t = ctx->bits[0];
if ((ctx->bits[0] = t + ((uint32) len << 3)) < t)
ctx->bits[1]++; /* Carry from low to high */
ctx->bits[1] += len >> 29;
t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
/* Handle any leading odd-sized chunks */
if (t) {
unsigned char *p = (unsigned char *) ctx->in + t;
t = 64 - t;
if (len < t) {
memcpy(p, buf, len);
return;
}
memcpy(p, buf, t);
if (ctx->doByteReverse) byteReverse(ctx->in, 16);
MD5_Transform(ctx->buf, (uint32 *) ctx->in);
buf += t;
len -= t;
}
/* Process data in 64-byte chunks */
while (len >= 64) {
memcpy(ctx->in, buf, 64);
if (ctx->doByteReverse) byteReverse(ctx->in, 16);
MD5_Transform(ctx->buf, (uint32 *) ctx->in);
buf += 64;
len -= 64;
}
/* Handle any remaining bytes of data. */
memcpy(ctx->in, buf, len);
}
/*
* Final wrapup - pad to 64-byte boundary with the bit pattern
* 1 0* (64-bit count of bits processed, MSB-first)
*/
void MD5_Final(unsigned char digest[16], struct MD5Context *ctx)
{
unsigned count;
unsigned char *p;
/* Compute number of bytes mod 64 */
count = (ctx->bits[0] >> 3) & 0x3F;
/* Set the first char of padding to 0x80. This is safe since there is
always at least one byte free */
p = ctx->in + count;
*p++ = 0x80;
/* Bytes of padding needed to make 64 bytes */
count = 64 - 1 - count;
/* Pad out to 56 mod 64 */
if (count < 8) {
/* Two lots of padding: Pad the first block to 64 bytes */
memset(p, 0, count);
if (ctx->doByteReverse) byteReverse(ctx->in, 16);
MD5_Transform(ctx->buf, (uint32 *) ctx->in);
/* Now fill the next block with 56 bytes */
memset(ctx->in, 0, 56);
} else {
/* Pad block to 56 bytes */
memset(p, 0, count - 8);
}
if (ctx->doByteReverse) byteReverse(ctx->in, 14);
/* Append length in bits and transform */
memcpy(ctx->in+56, ctx->bits, sizeof(ctx->bits));
MD5_Transform(ctx->buf, (uint32 *) ctx->in);
if (ctx->doByteReverse) byteReverse((unsigned char *) ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5
/* The four core functions - F1 is optimized somewhat */
/* #define F1(x, y, z) (x & y | ~x & z) */
#define F1(x, y, z) (z ^ (x & (y ^ z)))
#define F2(x, y, z) F1(z, x, y)
#define F3(x, y, z) (x ^ y ^ z)
#define F4(x, y, z) (y ^ (x | ~z))
/* This is the central step in the MD5 algorithm. */
#define MD5STEP(f, w, x, y, z, data, s) \
( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
/*
* The core of the MD5 algorithm, this alters an existing MD5 hash to
* reflect the addition of 16 longwords of new data. MD5Update blocks
* the data and converts bytes into longwords for this routine.
*/
void MD5_Transform(uint32 buf[4], uint32 const in[16])
{
register uint32 a, b, c, d;
a = buf[0];
b = buf[1];
c = buf[2];
d = buf[3];
MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478U, 7);
MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756U, 12);
MD5STEP(F1, c, d, a, b, in[2] + 0x242070dbU, 17);
MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceeeU, 22);
MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0fafU, 7);
MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62aU, 12);
MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613U, 17);
MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501U, 22);
MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8U, 7);
MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7afU, 12);
MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1U, 17);
MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7beU, 22);
MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122U, 7);
MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193U, 12);
MD5STEP(F1, c, d, a, b, in[14] + 0xa679438eU, 17);
MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821U, 22);
MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562U, 5);
MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340U, 9);
MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51U, 14);
MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aaU, 20);
MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105dU, 5);
MD5STEP(F2, d, a, b, c, in[10] + 0x02441453U, 9);
MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681U, 14);
MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8U, 20);
MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6U, 5);
MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6U, 9);
MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87U, 14);
MD5STEP(F2, b, c, d, a, in[8] + 0x455a14edU, 20);
MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905U, 5);
MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8U, 9);
MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9U, 14);
MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8aU, 20);
MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942U, 4);
MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681U, 11);
MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122U, 16);
MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380cU, 23);
MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44U, 4);
MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9U, 11);
MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60U, 16);
MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70U, 23);
MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6U, 4);
MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127faU, 11);
MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085U, 16);
MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05U, 23);
MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039U, 4);
MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5U, 11);
MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8U, 16);
MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665U, 23);
MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244U, 6);
MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97U, 10);
MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7U, 15);
MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039U, 21);
MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3U, 6);
MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92U, 10);
MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47dU, 15);
MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1U, 21);
MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4fU, 6);
MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0U, 10);
MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314U, 15);
MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1U, 21);
MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82U, 6);
MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235U, 10);
MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bbU, 15);
MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391U, 21);
buf[0] += a;
buf[1] += b;
buf[2] += c;
buf[3] += d;
}
#endif

28
lib/isomd5/md5.h Normal file
View File

@ -0,0 +1,28 @@
#ifndef MD5_H
#define MD5_H
#include <stdint.h>
#include <sys/types.h>
typedef uint32_t u_int32_t;
typedef u_int32_t uint32;
struct MD5Context {
uint32 buf[4];
uint32 bits[2];
unsigned char in[64];
int doByteReverse;
};
void MD5_Init(struct MD5Context *);
void MD5_Update(struct MD5Context *, unsigned const char *, unsigned);
void MD5_Final(unsigned char digest[16], struct MD5Context *);
/*
* This is needed to make RSAREF happy on some MS-DOS compilers.
*/
typedef struct MD5Context MD5_CTX;
#endif /* MD5_H */

3
lib/lib.pro Normal file
View File

@ -0,0 +1,3 @@
TEMPLATE = subdirs
SUBDIRS = isomd5

View File

@ -1,3 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = app helper
SUBDIRS = lib app helper
app.depends = lib
helper.depends = lib