[isomd5sum 1/2] Cleanup TABs and update Copyrights
Brian C. Lane
bcl at redhat.com
Thu Feb 21 14:33:07 UTC 2013
From: "Brian C. Lane" <bcl at redhat.com>
---
checkisomd5.c | 64 +++++-----
implantisomd5.c | 20 +--
libcheckisomd5.c | 199 +++++++++++++++---------------
libimplantisomd5.c | 136 ++++++++++-----------
md5.c | 348 ++++++++++++++++++++++++++---------------------------
pyisomd5sum.c | 2 +-
6 files changed, 385 insertions(+), 384 deletions(-)
diff --git a/checkisomd5.c b/checkisomd5.c
index df06f5f..98c01d8 100644
--- a/checkisomd5.c
+++ b/checkisomd5.c
@@ -1,6 +1,6 @@
/*
* checkosmd5 - simple program to check implanted md5sum
- * Copyright (C) 2001-2007 Red Hat, Inc.
+ * Copyright (C) 2001-2013 Red Hat, Inc.
* Michael Fulbright <msf at redhat.com>
*
* This program is free software; you can redistribute it and/or
@@ -84,24 +84,24 @@ int processExitStatus(int rc) {
char * result;
switch (rc) {
- case ISOMD5SUM_CHECK_FAILED:
- result = "FAIL.\n\nIt is not recommended to use this media.";
- break;
- case ISOMD5SUM_CHECK_ABORTED:
- result = "UNKNOWN.\n\nThe media check was aborted.";
- break;
- case ISOMD5SUM_CHECK_NOT_FOUND:
- result = "NA.\n\nNo checksum information available, unable to verify media.";
- break;
+ case ISOMD5SUM_CHECK_FAILED:
+ result = "FAIL.\n\nIt is not recommended to use this media.";
+ break;
+ case ISOMD5SUM_CHECK_ABORTED:
+ result = "UNKNOWN.\n\nThe media check was aborted.";
+ break;
+ case ISOMD5SUM_CHECK_NOT_FOUND:
+ result = "NA.\n\nNo checksum information available, unable to verify media.";
+ break;
case ISOMD5SUM_FILE_NOT_FOUND:
- result = "NA.\n\nFile not found.";
- break;
- case ISOMD5SUM_CHECK_PASSED:
- result = "PASS.\n\nIt is OK to use this media.";
- break;
- default:
- result = "checkisomd5 ERROR - bad return value";
- break;
+ result = "NA.\n\nFile not found.";
+ break;
+ case ISOMD5SUM_CHECK_PASSED:
+ result = "PASS.\n\nIt is OK to use this media.";
+ break;
+ default:
+ result = "checkisomd5 ERROR - bad return value";
+ break;
}
fprintf(stderr, "\nThe media check is complete, the result is: %s\n", result);
@@ -126,11 +126,11 @@ int main(int argc, char **argv) {
data.gauge = 0;
struct poptOption options[] = {
- { "md5sumonly", 'o', POPT_ARG_NONE, &md5only, 0 },
- { "verbose", 'v', POPT_ARG_NONE, &data.verbose, 0 },
- { "gauge", 'g', POPT_ARG_NONE, &data.gauge, 0},
- { "help", 'h', POPT_ARG_NONE, &help, 0},
- { 0, 0, 0, 0, 0}
+ { "md5sumonly", 'o', POPT_ARG_NONE, &md5only, 0 },
+ { "verbose", 'v', POPT_ARG_NONE, &data.verbose, 0 },
+ { "gauge", 'g', POPT_ARG_NONE, &data.gauge, 0},
+ { "help", 'h', POPT_ARG_NONE, &help, 0},
+ { 0, 0, 0, 0, 0}
};
static struct termios oldt, newt;
@@ -138,28 +138,28 @@ int main(int argc, char **argv) {
optCon = poptGetContext("checkisomd5", argc, (const char **)argv, options, 0);
if ((rc = poptGetNextOpt(optCon)) < -1) {
- fprintf(stderr, "bad option %s: %s\n",
- poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
- poptStrerror(rc));
- exit(1);
+ fprintf(stderr, "bad option %s: %s\n",
+ poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
+ poptStrerror(rc));
+ exit(1);
}
if (help)
- usage();
+ usage();
args = poptGetArgs(optCon);
if (!args || !args[0] || !args[0][0])
- usage();
+ usage();
if (md5only|data.verbose) {
- rc = printMD5SUM((char *)args[0]);
+ rc = printMD5SUM((char *)args[0]);
if (rc < 0) {
exit(processExitStatus(rc));
}
}
if (md5only)
- exit(0);
+ exit(0);
printf("Press [Esc] to abort check.\n");
@@ -171,7 +171,7 @@ int main(int argc, char **argv) {
tcsetattr(0, TCSANOW, &oldt);
if (data.verbose)
- printf("\n");
+ printf("\n");
exit(processExitStatus(rc));
}
diff --git a/implantisomd5.c b/implantisomd5.c
index 759f841..f116f8c 100644
--- a/implantisomd5.c
+++ b/implantisomd5.c
@@ -1,6 +1,6 @@
/*
* simple program to insert an md5sum into application data area of iso99660
- * Copyright (C) 2001-2007 Red Hat, Inc.
+ * Copyright (C) 2001-2013 Red Hat, Inc.
* Michael Fulbright <msf at redhat.com>
*
* This program is free software; you can redistribute it and/or
@@ -43,10 +43,10 @@ int main(int argc, char **argv) {
poptContext optCon;
struct poptOption options[] = {
- { "force", 'f', POPT_ARG_NONE, &forceit, 0 },
- { "supported-iso", 'S', POPT_ARG_NONE, &supported, 0 },
- { "help", 'h', POPT_ARG_NONE, &help, 0},
- { 0, 0, 0, 0, 0}
+ { "force", 'f', POPT_ARG_NONE, &forceit, 0 },
+ { "supported-iso", 'S', POPT_ARG_NONE, &supported, 0 },
+ { "help", 'h', POPT_ARG_NONE, &help, 0},
+ { 0, 0, 0, 0, 0}
};
@@ -54,13 +54,13 @@ int main(int argc, char **argv) {
if ((rc = poptGetNextOpt(optCon)) < -1) {
fprintf(stderr, "bad option %s: %s\n",
- poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
- poptStrerror(rc));
+ poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
+ poptStrerror(rc));
exit(1);
}
if (help)
- usage();
+ usage();
args = poptGetArgs(optCon);
if (!args || !args[0] || !args[0][0])
@@ -70,8 +70,8 @@ int main(int argc, char **argv) {
if (rc) {
fprintf(stderr, "ERROR: ");
fprintf(stderr, errstr, (char *)args[0]);
- exit(1);
+ exit(1);
} else {
- exit(0);
+ exit(0);
}
}
diff --git a/libcheckisomd5.c b/libcheckisomd5.c
index 8bca842..0454513 100644
--- a/libcheckisomd5.c
+++ b/libcheckisomd5.c
@@ -1,10 +1,10 @@
/*
- * Copyright (C) 2001-2007 Red Hat, Inc.
+ * Copyright (C) 2001-2013 Red Hat, Inc.
*
* Michael Fulbright <msf at redhat.com>
* Dustin Kirkland <dustin.dirkland at gmail.com>
- * Added support for checkpoint fragment sums;
- * Exits media check as soon as bad fragment md5sum'ed
+ * 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
@@ -55,20 +55,20 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
char *p;
if (lseek(isofd, (off_t)(16L * 2048L), SEEK_SET) == -1)
- return ((long long)-1);
+ return ((long long)-1);
offset = (16L * 2048L);
for (;1;) {
- if (read(isofd, buf, 2048) <= 0)
- return ((long long)-1);
-
- if (buf[0] == 1)
- /* found primary volume descriptor */
- break;
- else if (buf[0] == 255)
- /* hit end and didn't find primary volume descriptor */
- return ((long long)-1);
- offset += 2048L;
+ if (read(isofd, buf, 2048) <= 0)
+ return ((long long)-1);
+
+ if (buf[0] == 1)
+ /* found primary volume descriptor */
+ break;
+ else if (buf[0] == 255)
+ /* hit end and didn't find primary volume descriptor */
+ return ((long long)-1);
+ offset += 2048L;
}
/* read out md5sum */
@@ -84,47 +84,47 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
supportedfnd = 0;
loc = 0;
while (loc < 512) {
- if (!strncmp(buf2 + loc, "ISO MD5SUM = ", 13)) {
-
- /* make sure we dont walk off end */
- if ((loc + 32 + 13) > 511)
- return -1;
-
- memcpy(mediasum, buf2 + loc + 13, 32);
- mediasum[32] = '\0';
- md5fnd = 1;
- loc += 45;
- for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
- } else if (!strncmp(buf2 + loc, "SKIPSECTORS = ", 14)) {
- char *errptr;
-
- /* make sure we dont walk off end */
- if ((loc + 14) > 511)
- return -1;
-
- loc = loc + 14;
- for (p=tmpbuf; buf2[loc] != ';' && loc < 512; p++, loc++)
- *p = buf2[loc];
-
- *p = '\0';
-
- *skipsectors = strtol(tmpbuf, &errptr, 10);
- if (errptr && *errptr) {
- return -1;
- } else {
- skipfnd = 1;
- }
-
- for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
- } else if (!strncmp(buf2 + loc, "RHLISOSTATUS=1", 14)) {
- *supported = 1;
- supportedfnd = 1;
- for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
- } else if (!strncmp(buf2 + loc, "RHLISOSTATUS=0", 14)) {
- *supported = 0;
- supportedfnd = 1;
- for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
- } else if (!strncmp(buf2 + loc, "FRAGMENT SUMS = ", 16)) {
+ if (!strncmp(buf2 + loc, "ISO MD5SUM = ", 13)) {
+
+ /* make sure we dont walk off end */
+ if ((loc + 32 + 13) > 511)
+ return -1;
+
+ memcpy(mediasum, buf2 + loc + 13, 32);
+ mediasum[32] = '\0';
+ md5fnd = 1;
+ loc += 45;
+ for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
+ } else if (!strncmp(buf2 + loc, "SKIPSECTORS = ", 14)) {
+ char *errptr;
+
+ /* make sure we dont walk off end */
+ if ((loc + 14) > 511)
+ return -1;
+
+ loc = loc + 14;
+ for (p=tmpbuf; buf2[loc] != ';' && loc < 512; p++, loc++)
+ *p = buf2[loc];
+
+ *p = '\0';
+
+ *skipsectors = strtol(tmpbuf, &errptr, 10);
+ if (errptr && *errptr) {
+ return -1;
+ } else {
+ skipfnd = 1;
+ }
+
+ for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
+ } else if (!strncmp(buf2 + loc, "RHLISOSTATUS=1", 14)) {
+ *supported = 1;
+ supportedfnd = 1;
+ for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
+ } else if (!strncmp(buf2 + loc, "RHLISOSTATUS=0", 14)) {
+ *supported = 0;
+ supportedfnd = 1;
+ for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
+ } else if (!strncmp(buf2 + loc, "FRAGMENT SUMS = ", 16)) {
/* make sure we dont walk off end */
if ((loc + FRAGMENT_SUM_LENGTH) > 511)
return -1;
@@ -155,19 +155,19 @@ static int parsepvd(int isofd, char *mediasum, int *skipsectors, long long *isos
for (p=buf2+loc; *p != ';' && loc < 512; p++, loc++);
} else {
- loc++;
- }
+ loc++;
+ }
- if ((skipfnd & md5fnd & fragsumfnd & fragcntfnd) & supportedfnd)
- break;
+ if ((skipfnd & md5fnd & fragsumfnd & fragcntfnd) & supportedfnd)
+ break;
}
if (!(skipfnd & md5fnd))
- return -1;
+ return -1;
/* get isosize */
*isosize = (buf[SIZE_OFFSET]*0x1000000+buf[SIZE_OFFSET+1]*0x10000 +
- buf[SIZE_OFFSET+2]*0x100 + buf[SIZE_OFFSET+3]) * 2048LL;
+ buf[SIZE_OFFSET+2]*0x100 + buf[SIZE_OFFSET+3]) * 2048LL;
return offset;
}
@@ -195,7 +195,7 @@ static int checkmd5sum(int isofd, char *mediasum, char *computedsum, checkCallba
MD5_CTX md5ctx, fragmd5ctx;
if ((pvd_offset = parsepvd(isofd, mediasum, &skipsectors, &isosize, &supported, fragmentsums, &fragmentcount)) < 0)
- return ISOMD5SUM_CHECK_NOT_FOUND;
+ return ISOMD5SUM_CHECK_NOT_FOUND;
/* printf("Mediasum = %s\n",mediasum); */
@@ -212,43 +212,43 @@ static int checkmd5sum(int isofd, char *mediasum, char *computedsum, checkCallba
cb(cbdata, 0, isosize - skipsectors*2048);
while (offset < isosize - skipsectors*2048) {
- nattempt = MIN(isosize - skipsectors*2048 - offset, bufsize);
+ nattempt = MIN(isosize - skipsectors*2048 - offset, bufsize);
- /* printf("%lld %lld %lld %d\n", offset, isosize, isosize-SKIPSECTORS*2048, nattempt); */
+ /* printf("%lld %lld %lld %d\n", offset, isosize, isosize-SKIPSECTORS*2048, nattempt); */
- nread = read(isofd, buf, nattempt);
- if (nread <= 0)
- break;
+ nread = read(isofd, buf, nattempt);
+ if (nread <= 0)
+ break;
if (nread > nattempt) {
nread = nattempt;
lseek(isofd, offset+nread, SEEK_SET);
}
- /* overwrite md5sum we implanted with original data */
- if (offset < apoff && offset+nread >= apoff) {
- appdata_start_offset = apoff - offset;
- appdata_end_offset = MIN(appdata_start_offset+MIN(nread, 512),
- offset + nread - apoff);
- len = appdata_end_offset - appdata_start_offset;
- memset(buf+appdata_start_offset, ' ', len);
- } else if (offset >= apoff && offset+nread < apoff + 512) {
- appdata_start_offset = 0;
- appdata_end_offset = nread;
- len = appdata_end_offset - appdata_start_offset;
- memset(buf+appdata_start_offset, ' ', len);
- } else if (offset < apoff + 512 && offset+nread >= apoff + 512) {
- appdata_start_offset = 0;
- appdata_end_offset = apoff + 512 - offset;
- len = appdata_end_offset - appdata_start_offset;
- memset(buf+appdata_start_offset, ' ', len);
- }
-
- MD5_Update(&md5ctx, buf, nread);
+ /* overwrite md5sum we implanted with original data */
+ if (offset < apoff && offset+nread >= apoff) {
+ appdata_start_offset = apoff - offset;
+ appdata_end_offset = MIN(appdata_start_offset+MIN(nread, 512),
+ offset + nread - apoff);
+ len = appdata_end_offset - appdata_start_offset;
+ memset(buf+appdata_start_offset, ' ', len);
+ } else if (offset >= apoff && offset+nread < apoff + 512) {
+ appdata_start_offset = 0;
+ appdata_end_offset = nread;
+ len = appdata_end_offset - appdata_start_offset;
+ memset(buf+appdata_start_offset, ' ', len);
+ } else if (offset < apoff + 512 && offset+nread >= apoff + 512) {
+ appdata_start_offset = 0;
+ appdata_end_offset = apoff + 512 - offset;
+ len = appdata_end_offset - appdata_start_offset;
+ memset(buf+appdata_start_offset, ' ', len);
+ }
+
+ MD5_Update(&md5ctx, buf, nread);
if (fragmentcount) {
current_fragment = offset * (fragmentcount+1) / (isosize - skipsectors*2048);
/* if we're onto the next fragment, calculate the previous sum and check */
if ( current_fragment != previous_fragment ) {
- memcpy(&fragmd5ctx, &md5ctx, sizeof(MD5_CTX));
+ memcpy(&fragmd5ctx, &md5ctx, sizeof(MD5_CTX));
MD5_Final(fragmd5sum, &fragmd5ctx);
*computedsum = '\0';
j = (current_fragment-1)*FRAGMENT_SUM_LENGTH/fragmentcount;
@@ -266,8 +266,8 @@ static int checkmd5sum(int isofd, char *mediasum, char *computedsum, checkCallba
}
}
}
- offset = offset + nread;
- if (cb)
+ offset = offset + nread;
+ if (cb)
if(cb(cbdata, offset, isosize - skipsectors*2048)) return ISOMD5SUM_CHECK_ABORTED;
}
@@ -282,17 +282,17 @@ static int checkmd5sum(int isofd, char *mediasum, char *computedsum, checkCallba
*computedsum = '\0';
for (i=0; i<16; i++) {
- char tmpstr[4];
- snprintf (tmpstr, 4, "%02x", md5sum[i]);
- strncat(computedsum, tmpstr, 2);
+ char tmpstr[4];
+ snprintf (tmpstr, 4, "%02x", md5sum[i]);
+ strncat(computedsum, tmpstr, 2);
}
/* printf("mediasum, computedsum = %s %s\n", mediasum, computedsum); */
if (strcmp(mediasum, computedsum))
- return ISOMD5SUM_CHECK_FAILED;
+ return ISOMD5SUM_CHECK_FAILED;
else
- return ISOMD5SUM_CHECK_PASSED;
+ return ISOMD5SUM_CHECK_PASSED;
}
@@ -303,7 +303,7 @@ static int doMediaCheck(int isofd, char *mediasum, char *computedsum, long long
char fragmentsums[FRAGMENT_SUM_LENGTH+1];
if (parsepvd(isofd, mediasum, &skipsectors, isosize, supported, fragmentsums, &fragmentcount) < 0) {
- return ISOMD5SUM_CHECK_NOT_FOUND;
+ return ISOMD5SUM_CHECK_NOT_FOUND;
}
rc = checkmd5sum(isofd, mediasum, computedsum, cb, cbdata);
@@ -321,7 +321,7 @@ int mediaCheckFile(char *file, checkCallback cb, void *cbdata) {
isofd = open(file, O_RDONLY);
if (isofd < 0) {
- return ISOMD5SUM_FILE_NOT_FOUND;
+ return ISOMD5SUM_FILE_NOT_FOUND;
}
rc = doMediaCheck(isofd, mediasum, computedsum, &isosize, &supported, cb, cbdata);
@@ -329,7 +329,8 @@ int mediaCheckFile(char *file, checkCallback cb, void *cbdata) {
close(isofd);
/* printf("isosize = %lld\n", isosize);
- printf("%s\n%s\n", mediasum, computedsum);*/
+ * printf("%s\n%s\n", mediasum, computedsum);
+ */
return rc;
}
@@ -354,7 +355,7 @@ int printMD5SUM(char *file) {
}
close(isofd);
-
+
printf("%s: %s\n", file, mediasum);
if ( (strlen(fragmentsums) > 0) && (fragmentcount > 0) ) {
printf("Fragment sums: %s\n", fragmentsums);
diff --git a/libimplantisomd5.c b/libimplantisomd5.c
index 4009809..d1b342d 100644
--- a/libimplantisomd5.c
+++ b/libimplantisomd5.c
@@ -1,10 +1,10 @@
/*
- * Copyright (C) 2001-2007 Red Hat, Inc.
+ * Copyright (C) 2001-2013 Red Hat, Inc.
*
* Michael Fulbright <msf at redhat.com>
* Dustin Kirkland <dustin.dirkland at gmail.com>
- * Added support for checkpoint fragment sums;
- * Exits media check as soon as bad fragment md5sum'ed
+ * 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
@@ -55,39 +55,39 @@ static int parsepvd(int isofd, char *mediasum, long long *isosize) {
unsigned char *p __attribute__((unused));
if (lseek(isofd, 16*2048, SEEK_SET) == -1)
- return ((long long)-1);
-
+ return ((long long)-1);
+
offset = (16 * 2048);
for (;1;) {
if (read(isofd, buf, 2048L) == -1)
- return ((long long)-1);
-
- if (buf[0] == 1)
- /* found primary volume descriptor */
- break;
- else if (buf[0] == 255)
- /* hit end and didn't find primary volume descriptor */
- return ((long long)-1);
- offset += 2048L;
+ return ((long long)-1);
+
+ if (buf[0] == 1)
+ /* found primary volume descriptor */
+ break;
+ else if (buf[0] == 255)
+ /* hit end and didn't find primary volume descriptor */
+ return ((long long)-1);
+ offset += 2048L;
}
-
+
/* read out md5sum */
#if 0
memcpy(mediasum, buf + APPDATA_OFFSET + 13, 32);
mediasum[32] = '\0';
for (p=mediasum; *p; p++)
- if (*p != ' ')
- break;
+ if (*p != ' ')
+ break;
/* if the md5sum was all spaces, we didn't find md5sum */
if (!*p)
- return -1;
+ return -1;
#endif
/* get isosize */
*isosize = (buf[SIZE_OFFSET]*0x1000000+buf[SIZE_OFFSET+1]*0x10000 +
- buf[SIZE_OFFSET+2]*0x100 + buf[SIZE_OFFSET+3]) * 2048LL;
+ buf[SIZE_OFFSET+2]*0x100 + buf[SIZE_OFFSET+3]) * 2048LL;
return offset;
}
@@ -95,8 +95,8 @@ static int parsepvd(int isofd, char *mediasum, long long *isosize) {
static unsigned int writeAppData(unsigned char *appdata, char *valstr, unsigned int loc) {
if (loc + strlen(valstr) > 511) {
- printf("Attempted to write too much appdata, exiting...\n");
- exit(-1);
+ printf("Attempted to write too much appdata, exiting...\n");
+ exit(-1);
}
memcpy(appdata + loc, valstr, strlen(valstr));
@@ -132,38 +132,38 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
isofd = open(fname, O_RDWR);
if (isofd < 0) {
- *errstr = "Error - Unable to open file %s\n\n";
- return -1;
+ *errstr = "Error - Unable to open file %s\n\n";
+ return -1;
}
pvd_offset = parsepvd(isofd, mediasum, &isosize);
if (pvd_offset < 0) {
- *errstr = "Could not find primary volumne!\n\n";
- return -1;
+ *errstr = "Could not find primary volumne!\n\n";
+ return -1;
}
lseek(isofd, pvd_offset + APPDATA_OFFSET, SEEK_SET);
nread = read(isofd, orig_appdata, 512);
if (!forceit) {
- dirty = 0;
- for (i=0; i < 512; i++)
- if (orig_appdata[i] != ' ')
- dirty = 1;
-
- if (dirty) {
- *errstr = "Application data has been used - not implanting md5sum!\n";
- return -1;
- }
+ dirty = 0;
+ for (i=0; i < 512; i++)
+ if (orig_appdata[i] != ' ')
+ dirty = 1;
+
+ if (dirty) {
+ *errstr = "Application data has been used - not implanting md5sum!\n";
+ return -1;
+ }
} else {
- /* write out blanks to erase old app data */
- lseek(isofd, pvd_offset + APPDATA_OFFSET, SEEK_SET);
- memset(new_appdata, ' ', 512);
- i = write(isofd, new_appdata, 512);
- if (i<0) {
- printf("write failed %d\n", i);
- perror("");
- }
+ /* write out blanks to erase old app data */
+ lseek(isofd, pvd_offset + APPDATA_OFFSET, SEEK_SET);
+ memset(new_appdata, ' ', 512);
+ i = write(isofd, new_appdata, 512);
+ if (i<0) {
+ printf("write failed %d\n", i);
+ perror("");
+ }
}
/* now do md5sum */
@@ -178,17 +178,17 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
/* sectors on burned CDs */
while (total < isosize - SKIPSECTORS*2048) {
nattempt = MIN(isosize - SKIPSECTORS*2048 - total, bufsize);
- nread = read(isofd, buf, nattempt);
+ nread = read(isofd, buf, nattempt);
- if (nread <= 0)
- break;
-
- MD5_Update(&md5ctx, buf, nread);
+ if (nread <= 0)
+ break;
+
+ MD5_Update(&md5ctx, buf, nread);
/* if we're onto the next fragment, calculate the previous sum and write */
current_fragment = total * (FRAGMENT_COUNT+1) / (isosize - SKIPSECTORS*2048);
if ( current_fragment != previous_fragment ) {
- memcpy(&fragmd5ctx, &md5ctx, sizeof(MD5_CTX));
+ memcpy(&fragmd5ctx, &md5ctx, sizeof(MD5_CTX));
MD5_Final(fragmd5sum, &fragmd5ctx);
for (i=0; i<FRAGMENT_SUM_LENGTH/FRAGMENT_COUNT; i++) {
char tmpstr[2];
@@ -199,7 +199,7 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
previous_fragment = current_fragment;
}
- total = total + nread;
+ total = total + nread;
}
free(buf);
@@ -207,17 +207,17 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
*md5str = '\0';
for (i=0; i<16; i++) {
- char tmpstr[4];
- snprintf (tmpstr, 4, "%02x", md5sum[i]);
- strncat(md5str, tmpstr, 2);
+ char tmpstr[4];
+ snprintf (tmpstr, 4, "%02x", md5sum[i]);
+ strncat(md5str, tmpstr, 2);
}
if (!quiet) {
- printf("Inserting md5sum into iso image...\n");
- printf("md5 = %s\n", md5str);
- printf("Inserting fragment md5sums into iso image...\n");
- printf("fragmd5 = %s\n", fragstr);
- printf("frags = %d\n", FRAGMENT_COUNT);
+ printf("Inserting md5sum into iso image...\n");
+ printf("md5 = %s\n", md5str);
+ printf("Inserting fragment md5sums into iso image...\n");
+ printf("fragmd5 = %s\n", fragstr);
+ printf("frags = %d\n", FRAGMENT_COUNT);
}
/* memcpy(new_appdata, orig_appdata, 512); */
memset(new_appdata, ' ', 512);
@@ -235,15 +235,15 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
free(buf);
if (supported) {
- if (!quiet)
- printf("Setting supported flag to 1\n");
- loc = writeAppData(new_appdata, "RHLISOSTATUS=1", loc);
+ if (!quiet)
+ printf("Setting supported flag to 1\n");
+ loc = writeAppData(new_appdata, "RHLISOSTATUS=1", loc);
} else {
- if (!quiet)
- printf("Setting supported flag to 0\n");
- loc = writeAppData(new_appdata, "RHLISOSTATUS=0", loc);
+ if (!quiet)
+ printf("Setting supported flag to 0\n");
+ loc = writeAppData(new_appdata, "RHLISOSTATUS=0", loc);
}
-
+
loc = writeAppData(new_appdata, ";", loc);
loc = writeAppData(new_appdata, "FRAGMENT SUMS = ", loc);
@@ -257,15 +257,15 @@ int implantISOFile(char *fname, int supported, int forceit, int quiet, char **er
free(buf);
loc = writeAppData(new_appdata, "THIS IS NOT THE SAME AS RUNNING MD5SUM ON THIS ISO!!", loc);
-
+
i = lseek(isofd, pvd_offset + APPDATA_OFFSET, SEEK_SET);
if (i<0)
- printf("seek failed\n");
+ printf("seek failed\n");
i = write(isofd, new_appdata, 512);
if (i<0) {
- printf("write failed %d\n", i);
- perror("");
+ printf("write failed %d\n", i);
+ perror("");
}
close(isofd);
diff --git a/md5.c b/md5.c
index a1bdd4a..111aa86 100644
--- a/md5.c
+++ b/md5.c
@@ -36,13 +36,13 @@ static void byteReverse(unsigned char *buf, unsigned longs);
*/
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);
+ 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
@@ -52,19 +52,19 @@ static void byteReverse(unsigned char *buf, unsigned longs)
*/
void MD5_Init(struct MD5Context *ctx)
{
- ctx->buf[0] = 0x67452301U;
- ctx->buf[1] = 0xefcdab89U;
- ctx->buf[2] = 0x98badcfeU;
- ctx->buf[3] = 0x10325476U;
+ ctx->buf[0] = 0x67452301U;
+ ctx->buf[1] = 0xefcdab89U;
+ ctx->buf[2] = 0x98badcfeU;
+ ctx->buf[3] = 0x10325476U;
- ctx->bits[0] = 0;
- ctx->bits[1] = 0;
+ ctx->bits[0] = 0;
+ ctx->bits[1] = 0;
- if (IS_BIG_ENDIAN())
- ctx->doByteReverse = 1;
- else
- ctx->doByteReverse = 0;
+ if (IS_BIG_ENDIAN())
+ ctx->doByteReverse = 1;
+ else
+ ctx->doByteReverse = 0;
}
/*
@@ -73,46 +73,46 @@ void MD5_Init(struct MD5Context *ctx)
*/
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);
+ 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);
}
/*
@@ -121,43 +121,43 @@ void MD5_Update(struct MD5Context *ctx, unsigned const char *buf, unsigned len)
*/
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 */
- ((uint32 *) ctx->in)[14] = ctx->bits[0];
- ((uint32 *) ctx->in)[15] = ctx->bits[1];
-
- 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 */
+ 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 */
+ ((uint32 *) ctx->in)[14] = ctx->bits[0];
+ ((uint32 *) ctx->in)[15] = ctx->bits[1];
+
+ 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
@@ -172,7 +172,7 @@ void MD5_Final(unsigned char digest[16], struct MD5Context *ctx)
/* 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 )
+ ( 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
@@ -181,85 +181,85 @@ void MD5_Final(unsigned char digest[16], struct MD5Context *ctx)
*/
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;
+ 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
diff --git a/pyisomd5sum.c b/pyisomd5sum.c
index 5c37397..c9ed37c 100644
--- a/pyisomd5sum.c
+++ b/pyisomd5sum.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2012 Red Hat, Inc.
+ * Copyright (C) 2001-2013 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
--
1.8.1
More information about the anaconda-patches
mailing list