[Debburn-changes] r702 - in cdrkit/trunk: genisoimage icedax wodim
Eduard Bloch
blade at alioth.debian.org
Fri Feb 9 23:02:44 CET 2007
Author: blade
Date: 2007-02-09 23:02:42 +0100 (Fri, 09 Feb 2007)
New Revision: 702
Removed:
cdrkit/trunk/icedax/md5.h
cdrkit/trunk/icedax/md5c.c
Modified:
cdrkit/trunk/genisoimage/genisoimage.h
cdrkit/trunk/genisoimage/tree.c
cdrkit/trunk/genisoimage/udf.c
cdrkit/trunk/genisoimage/udf.h
cdrkit/trunk/icedax/CMakeLists.txt
cdrkit/trunk/icedax/icedax.c
cdrkit/trunk/icedax/lconfig.h
cdrkit/trunk/wodim/drv_mmc.c
Log:
[if nobody cares about it, I will do] removed md5 related parts which have not been used and had weird licensing
Modified: cdrkit/trunk/genisoimage/genisoimage.h
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.h 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/genisoimage/genisoimage.h 2007-02-09 22:02:42 UTC (rev 702)
@@ -132,6 +132,7 @@
#ifdef UDF
int udf_file_entry_sector; /* also used as UDF unique ID */
#endif
+ uint64_t realsize;
};
struct file_hash {
Modified: cdrkit/trunk/genisoimage/tree.c
===================================================================
--- cdrkit/trunk/genisoimage/tree.c 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/genisoimage/tree.c 2007-02-09 22:02:42 UTC (rev 702)
@@ -58,6 +58,10 @@
#include "vms.h"
#endif
+#ifdef UDF
+#include "udf.h"
+#endif
+
/*
* Autoconf should be able to figure this one out for us and let us know
* whether the system has memmove or not.
@@ -555,6 +559,7 @@
set_723(table->isorec.volume_sequence_number,
volume_sequence_number);
set_733((char *) table->isorec.size, tablesize);
+ table->realsize = tablesize;
table->size = tablesize;
table->filedir = this_dir;
if (jhide_trans_tbl)
@@ -884,6 +889,7 @@
set_723(s_entry->isorec.volume_sequence_number,
volume_sequence_number);
set_733(s_entry->isorec.size, SECTOR_SIZE);
+ s_entry->realsize = SECTOR_SIZE;
memset(s_entry->isorec.extent, 0, 8);
s_entry->filedir = dirnode->parent;
@@ -924,6 +930,7 @@
set_723(s_entry->isorec.volume_sequence_number,
volume_sequence_number);
set_733(s_entry->isorec.size, SECTOR_SIZE);
+ s_entry->realsize=SECTOR_SIZE;
memset(s_entry->isorec.extent, 0, 8);
s_entry->filedir = dirnode;
@@ -1545,31 +1552,17 @@
#endif
return (0);
}
-#ifdef HAVE_LARGEFILES
- /*
- * XXX What happens with Apple HFS? Does it allow files >= 2 GB?
- */
- if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0xFFFFFFFF)) {
-#else
- /*
- * >= is required by the large file summit standard.
- */
if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x7FFFFFFF)) {
-#endif
-#ifdef EOVERFLOW
- errno = EOVERFLOW;
-#else
- errno = EFBIG;
-#endif
-#ifdef USE_LIBSCHILY
- comerr("File %s is too large - ignoring\n",
- whole_path);
-#else
- fprintf(stderr,
- "File %s is too large (errno = %d) - ignoring\n",
- whole_path, errno);
-#endif
- exit(1);
+ fprintf(stderr, "File %s is larger than 2GiB.\n", whole_path);
+ if(use_udf) {
+ fprintf(stderr, "This size can only be represented in the UDF filesystem.\n"
+ "Make sure that your clients support and use it.\n"
+ "ISO9660, Joliet, RockRidge, HFS will display incorrect size.\n");
+ }
+ else {
+ fprintf(stderr, "-udf was not specified. There is no way do represent this file size. Aborting.\n");
+ exit(1);
+ }
}
/*
* Add this so that we can detect directory loops with hard links.
@@ -1929,6 +1922,7 @@
}
set_733((char *) s_entry->isorec.size, statbuf.st_size);
+ s_entry->realsize = statbuf.st_size;
} else {
s_entry->isorec.flags[0] |= ISO_DIRECTORY;
}
@@ -1996,6 +1990,7 @@
statbuf.st_size = (off_t)0;
statbuf.st_mode &= 0777;
set_733((char *) s_entry->isorec.size, 0);
+ s_entry->realsize=0;
s_entry->size = 0;
s_entry->isorec.flags[0] = ISO_FILE;
s_entry->inode = UNCACHED_INODE;
Modified: cdrkit/trunk/genisoimage/udf.c
===================================================================
--- cdrkit/trunk/genisoimage/udf.c 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/genisoimage/udf.c 2007-02-09 22:02:42 UTC (rev 702)
@@ -329,17 +329,10 @@
}
static void
-set64(udf_Uint64 *dst, unsigned src)
+set64(udf_Uint64 *dst, uint64_t src)
{
set32(&dst->l, src);
- /*
- * src>>32 actually does the wrong thing on x86 with at least
- * one compiler, because of x86's shift count masking. Since
- * we never pass more than 32 sig. bits to the function anyway,
- * and all the structures we fill in are zeroed beforehand,
- * just skip setting the high word.
- */
- /*set32(&dst->h, src>>32);*/
+ set32(&dst->h, src>>32);
}
static int
@@ -662,7 +655,7 @@
static void
set_file_entry(unsigned char *buf, unsigned rba, unsigned file_rba,
- unsigned length, const char *iso_date, int is_directory,
+ uint64_t length, const char *iso_date, int is_directory,
unsigned link_count, unsigned unique_id)
{
udf_short_ad *allocation_desc;
@@ -923,7 +916,7 @@
buf,
(last_extent_written++) - lba_udf_partition_start,
read_733(de->isorec.extent) - lba_udf_partition_start,
- read_733(de->isorec.size),
+ de->realsize,
de->isorec.date,
0, /* is_directory */
1, /* link_count */
Modified: cdrkit/trunk/genisoimage/udf.h
===================================================================
--- cdrkit/trunk/genisoimage/udf.h 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/genisoimage/udf.h 2007-02-09 22:02:42 UTC (rev 702)
@@ -50,4 +50,6 @@
int assign_dvd_weights(char *name, struct directory *this_dir, int val);
+extern int use_udf;
+
#endif /* _UDF_H */
Modified: cdrkit/trunk/icedax/CMakeLists.txt
===================================================================
--- cdrkit/trunk/icedax/CMakeLists.txt 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/icedax/CMakeLists.txt 2007-02-09 22:02:42 UTC (rev 702)
@@ -19,7 +19,7 @@
ENDIF (WIN32)
LINK_DIRECTORIES(../librols ../libusal ../libparanoia)
-ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c md5c.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
+ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
SET_TARGET_PROPERTIES(icedax PROPERTIES SKIP_BUILD_RPATH TRUE)
Modified: cdrkit/trunk/icedax/icedax.c
===================================================================
--- cdrkit/trunk/icedax/icedax.c 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/icedax/icedax.c 2007-02-09 22:02:42 UTC (rev 702)
@@ -2314,7 +2314,7 @@
#ifdef MD5_SIGNATURES
fputs("MD5 signatures are currently broken! Sorry\n", stderr);
#else
- fputs("The option MD5 signatures is not configured!\n", stderr);
+ fputs("MD5 signatures are currently broken! Sorry\n", stderr);
#endif
}
if (user_sound_device) {
Modified: cdrkit/trunk/icedax/lconfig.h
===================================================================
--- cdrkit/trunk/icedax/lconfig.h 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/icedax/lconfig.h 2007-02-09 22:02:42 UTC (rev 702)
@@ -80,6 +80,6 @@
#define SOUND_DEV "/dev/dsp"
#define NSECTORS 75
#define INFOFILES
-#define MD5_SIGNATURES
+/* #undef MD5_SIGNATURES */ /* not implemented */
#define AUX_DEVICE "/dev/cdrom"
Deleted: cdrkit/trunk/icedax/md5.h
===================================================================
--- cdrkit/trunk/icedax/md5.h 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/icedax/md5.h 2007-02-09 22:02:42 UTC (rev 702)
@@ -1,48 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)md5.h 1.2 99/12/19 Copyright 1998,1999 Heiko Eissfeldt */
-/* MD5.H - header file for MD5C.C
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-/* MD5 context. */
-typedef struct {
- UINT4 state[4]; /* state (ABCD) */
- UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
- unsigned char buffer[64]; /* input buffer */
-} MD5_CTX;
-
-void MD5Init(MD5_CTX *);
-void MD5Update(MD5_CTX *, unsigned char *, unsigned int);
-void MD5Final(unsigned char [16], MD5_CTX *);
Deleted: cdrkit/trunk/icedax/md5c.c
===================================================================
--- cdrkit/trunk/icedax/md5c.c 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/icedax/md5c.c 2007-02-09 22:02:42 UTC (rev 702)
@@ -1,327 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)md5c.c 1.3 02/05/21 Copyright 1998,1999 Heiko Eissfeldt */
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-#include "config.h"
-#include "mytype.h"
-#include "md5.h"
-
-/* Constants for MD5Transform routine.
- */
-#define S11 7L
-#define S12 12L
-#define S13 17L
-#define S14 22L
-#define S21 5L
-#define S22 9L
-#define S23 14L
-#define S24 20L
-#define S31 4L
-#define S32 11L
-#define S33 16L
-#define S34 23L
-#define S41 6L
-#define S42 10L
-#define S43 15L
-#define S44 21L
-
-typedef unsigned char * POINTER;
-
-static void MD5Transform(UINT4 [4], unsigned char [64]);
-static void Encode(unsigned char *, UINT4 *, unsigned int);
-static void Decode(UINT4 *, unsigned char *, unsigned int);
-static void MD5_memcpy(POINTER, POINTER, unsigned int);
-static void MD5_memset(POINTER, int, unsigned int);
-
-static unsigned char PADDING[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
-};
-
-/* F, G, H and I are basic MD5 functions.
- */
-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define I(x, y, z) ((y) ^ ((x) | (~z)))
-
-/* ROTATE_LEFT rotates x left n bits.
- */
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32L-(n))))
-
-/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-Rotation is separate from addition to prevent recomputation.
- */
-#define FF(a, b, c, d, x, s, ac) { \
- (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-#define GG(a, b, c, d, x, s, ac) { \
- (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-#define HH(a, b, c, d, x, s, ac) { \
- (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-#define II(a, b, c, d, x, s, ac) { \
- (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
- (a) = ROTATE_LEFT ((a), (s)); \
- (a) += (b); \
- }
-
-/* MD5 initialization. Begins an MD5 operation, writing a new context.
- */
-void MD5Init (MD5_CTX *context)
-{
- context->count[0] = context->count[1] = 0;
- /* Load magic initialization constants.
-*/
- context->state[0] = UINT4_C(0x67452301);
- context->state[1] = UINT4_C(0xefcdab89);
- context->state[2] = UINT4_C(0x98badcfe);
- context->state[3] = UINT4_C(0x10325476);
-}
-
-/* MD5 block update operation. Continues an MD5 message-digest
- operation, processing another message block, and updating the
- context.
- */
-void MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
-{
- unsigned int i, indx, partLen;
-
- /* Compute number of bytes mod 64 */
- indx = (unsigned int)((context->count[0] >> 3L) & 0x3F);
-
- /* Update number of bits */
- if ((context->count[0] += ((UINT4)inputLen << 3L))
- < ((UINT4)inputLen << 3L))
- context->count[1]++;
- context->count[1] += ((UINT4)inputLen >> 29L);
-
- partLen = 64 - indx;
-
- /* Transform as many times as possible.
-*/
- if (inputLen >= partLen) {
- MD5_memcpy
- ((POINTER)&context->buffer[indx], (POINTER)input, partLen);
- MD5Transform (context->state, context->buffer);
-
- for (i = partLen; i + 63 < inputLen; i += 64)
- MD5Transform (context->state, &input[i]);
-
- indx = 0;
- }
- else
- i = 0;
-
- /* Buffer remaining input */
- MD5_memcpy
- ((POINTER)&context->buffer[indx], (POINTER)&input[i],
- inputLen-i);
-}
-
-/* MD5 finalization. Ends an MD5 message-digest operation, writing the
- the message digest and zeroizing the context.
- */
-void MD5Final(unsigned char digest[16], MD5_CTX *context)
-{
- unsigned char bits[8];
- unsigned int indx, padLen;
-
- /* Save number of bits */
- Encode (bits, context->count, 8);
-
- /* Pad out to 56 mod 64.
-*/
- indx = (unsigned int)((context->count[0] >> 3L) & 0x3f);
- padLen = (indx < 56) ? (56 - indx) : (120 - indx);
- MD5Update (context, PADDING, padLen);
-
- /* Append length (before padding) */
- MD5Update (context, bits, 8);
- /* Store state in digest */
- Encode (digest, context->state, 16);
-
- /* Zeroize sensitive information.
-*/
- MD5_memset ((POINTER)context, 0, sizeof (*context));
-}
-
-/* MD5 basic transformation. Transforms state based on block.
- */
-static void MD5Transform(UINT4 state[4], unsigned char block[64])
-{
- UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
- Decode (x, block, 64);
-
- /* Round 1 */
- FF (a, b, c, d, x[ 0], S11, UINT4_C(0xd76aa478)); /* 1 */
- FF (d, a, b, c, x[ 1], S12, UINT4_C(0xe8c7b756)); /* 2 */
- FF (c, d, a, b, x[ 2], S13, UINT4_C(0x242070db)); /* 3 */
- FF (b, c, d, a, x[ 3], S14, UINT4_C(0xc1bdceee)); /* 4 */
- FF (a, b, c, d, x[ 4], S11, UINT4_C(0xf57c0faf)); /* 5 */
- FF (d, a, b, c, x[ 5], S12, UINT4_C(0x4787c62a)); /* 6 */
- FF (c, d, a, b, x[ 6], S13, UINT4_C(0xa8304613)); /* 7 */
- FF (b, c, d, a, x[ 7], S14, UINT4_C(0xfd469501)); /* 8 */
- FF (a, b, c, d, x[ 8], S11, UINT4_C(0x698098d8)); /* 9 */
- FF (d, a, b, c, x[ 9], S12, UINT4_C(0x8b44f7af)); /* 10 */
- FF (c, d, a, b, x[10], S13, UINT4_C(0xffff5bb1)); /* 11 */
- FF (b, c, d, a, x[11], S14, UINT4_C(0x895cd7be)); /* 12 */
- FF (a, b, c, d, x[12], S11, UINT4_C(0x6b901122)); /* 13 */
- FF (d, a, b, c, x[13], S12, UINT4_C(0xfd987193)); /* 14 */
- FF (c, d, a, b, x[14], S13, UINT4_C(0xa679438e)); /* 15 */
- FF (b, c, d, a, x[15], S14, UINT4_C(0x49b40821)); /* 16 */
-
- /* Round 2 */
- GG (a, b, c, d, x[ 1], S21, UINT4_C(0xf61e2562)); /* 17 */
- GG (d, a, b, c, x[ 6], S22, UINT4_C(0xc040b340)); /* 18 */
- GG (c, d, a, b, x[11], S23, UINT4_C(0x265e5a51)); /* 19 */
- GG (b, c, d, a, x[ 0], S24, UINT4_C(0xe9b6c7aa)); /* 20 */
- GG (a, b, c, d, x[ 5], S21, UINT4_C(0xd62f105d)); /* 21 */
- GG (d, a, b, c, x[10], S22, UINT4_C( 0x2441453)); /* 22 */
- GG (c, d, a, b, x[15], S23, UINT4_C(0xd8a1e681)); /* 23 */
- GG (b, c, d, a, x[ 4], S24, UINT4_C(0xe7d3fbc8)); /* 24 */
- GG (a, b, c, d, x[ 9], S21, UINT4_C(0x21e1cde6)); /* 25 */
- GG (d, a, b, c, x[14], S22, UINT4_C(0xc33707d6)); /* 26 */
- GG (c, d, a, b, x[ 3], S23, UINT4_C(0xf4d50d87)); /* 27 */
- GG (b, c, d, a, x[ 8], S24, UINT4_C(0x455a14ed)); /* 28 */
- GG (a, b, c, d, x[13], S21, UINT4_C(0xa9e3e905)); /* 29 */
- GG (d, a, b, c, x[ 2], S22, UINT4_C(0xfcefa3f8)); /* 30 */
- GG (c, d, a, b, x[ 7], S23, UINT4_C(0x676f02d9)); /* 31 */
- GG (b, c, d, a, x[12], S24, UINT4_C(0x8d2a4c8a)); /* 32 */
-
- /* Round 3 */
- HH (a, b, c, d, x[ 5], S31, UINT4_C(0xfffa3942)); /* 33 */
- HH (d, a, b, c, x[ 8], S32, UINT4_C(0x8771f681)); /* 34 */
- HH (c, d, a, b, x[11], S33, UINT4_C(0x6d9d6122)); /* 35 */
- HH (b, c, d, a, x[14], S34, UINT4_C(0xfde5380c)); /* 36 */
- HH (a, b, c, d, x[ 1], S31, UINT4_C(0xa4beea44)); /* 37 */
- HH (d, a, b, c, x[ 4], S32, UINT4_C(0x4bdecfa9)); /* 38 */
- HH (c, d, a, b, x[ 7], S33, UINT4_C(0xf6bb4b60)); /* 39 */
- HH (b, c, d, a, x[10], S34, UINT4_C(0xbebfbc70)); /* 40 */
- HH (a, b, c, d, x[13], S31, UINT4_C(0x289b7ec6)); /* 41 */
- HH (d, a, b, c, x[ 0], S32, UINT4_C(0xeaa127fa)); /* 42 */
- HH (c, d, a, b, x[ 3], S33, UINT4_C(0xd4ef3085)); /* 43 */
- HH (b, c, d, a, x[ 6], S34, UINT4_C( 0x4881d05)); /* 44 */
- HH (a, b, c, d, x[ 9], S31, UINT4_C(0xd9d4d039)); /* 45 */
- HH (d, a, b, c, x[12], S32, UINT4_C(0xe6db99e5)); /* 46 */
- HH (c, d, a, b, x[15], S33, UINT4_C(0x1fa27cf8)); /* 47 */
- HH (b, c, d, a, x[ 2], S34, UINT4_C(0xc4ac5665)); /* 48 */
-
- /* Round 4 */
- II (a, b, c, d, x[ 0], S41, UINT4_C(0xf4292244)); /* 49 */
- II (d, a, b, c, x[ 7], S42, UINT4_C(0x432aff97)); /* 50 */
- II (c, d, a, b, x[14], S43, UINT4_C(0xab9423a7)); /* 51 */
- II (b, c, d, a, x[ 5], S44, UINT4_C(0xfc93a039)); /* 52 */
- II (a, b, c, d, x[12], S41, UINT4_C(0x655b59c3)); /* 53 */
- II (d, a, b, c, x[ 3], S42, UINT4_C(0x8f0ccc92)); /* 54 */
- II (c, d, a, b, x[10], S43, UINT4_C(0xffeff47d)); /* 55 */
- II (b, c, d, a, x[ 1], S44, UINT4_C(0x85845dd1)); /* 56 */
- II (a, b, c, d, x[ 8], S41, UINT4_C(0x6fa87e4f)); /* 57 */
- II (d, a, b, c, x[15], S42, UINT4_C(0xfe2ce6e0)); /* 58 */
- II (c, d, a, b, x[ 6], S43, UINT4_C(0xa3014314)); /* 59 */
- II (b, c, d, a, x[13], S44, UINT4_C(0x4e0811a1)); /* 60 */
- II (a, b, c, d, x[ 4], S41, UINT4_C(0xf7537e82)); /* 61 */
- II (d, a, b, c, x[11], S42, UINT4_C(0xbd3af235)); /* 62 */
- II (c, d, a, b, x[ 2], S43, UINT4_C(0x2ad7d2bb)); /* 63 */
- II (b, c, d, a, x[ 9], S44, UINT4_C(0xeb86d391)); /* 64 */
-
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
-
- /* Zeroize sensitive information.
-*/
- MD5_memset ((POINTER)x, 0, sizeof (x));
-}
-
-/* Encodes input (UINT4) into output (unsigned char). Assumes len is
- a multiple of 4.
- */
-static void Encode (unsigned char *output, UINT4 *input, unsigned int len)
-{
- unsigned int i, j;
-
- for (i = 0, j = 0; j < len; i++, j += 4) {
- output[j] = (unsigned char)(input[i] & 0xff);
- output[j+1] = (unsigned char)((input[i] >> 8L) & 0xff);
- output[j+2] = (unsigned char)((input[i] >> 16L) & 0xff);
- output[j+3] = (unsigned char)((input[i] >> 24L) & 0xff);
- }
-}
-
-/* Decodes input (unsigned char) into output (UINT4). Assumes len is
- a multiple of 4.
- */
-static void Decode(UINT4 *output, unsigned char *input, unsigned int len)
-{
- unsigned int i, j;
-
- for (i = 0, j = 0; j < len; i++, j += 4)
- output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8L) |
- (((UINT4)input[j+2]) << 16L) | (((UINT4)input[j+3]) << 24L);
-}
-
-/* Note: Replace "for loop" with standard memcpy if possible.
- */
-
-static void MD5_memcpy(POINTER output, POINTER input, unsigned int len)
-{
- unsigned int i;
-
- for (i = 0; i < len; i++)
- output[i] = input[i];
-}
-
-/* Note: Replace "for loop" with standard memset if possible.
- */
-static void MD5_memset(POINTER output, int value, unsigned int len)
-{
- unsigned int i;
-
- for (i = 0; i < len; i++)
- ((char *)output)[i] = (char)value;
-}
Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c 2007-02-02 20:56:37 UTC (rev 701)
+++ cdrkit/trunk/wodim/drv_mmc.c 2007-02-09 22:02:42 UTC (rev 702)
@@ -950,10 +950,10 @@
dp->cdr_cdcap = mp; /* Store MMC cap pointer */
dp->cdr_dstat->ds_dr_max_rspeed = a_to_u_2_byte(mp->max_read_speed)/1385;
- if (dp->cdr_dstat->ds_dr_max_rspeed == 0) /* EB: does that make sense? Looks like a smellin workaround for a rare case, but it should not hurt */
+ if (dp->cdr_dstat->ds_dr_max_rspeed == 0)
dp->cdr_dstat->ds_dr_max_rspeed = 1385;
dp->cdr_dstat->ds_dr_cur_rspeed = a_to_u_2_byte(mp->cur_read_speed)/1385;
- if (dp->cdr_dstat->ds_dr_cur_rspeed == 0) /* EB: does that make sense? Looks like a smellin workaround for a rare case, but it should not hurt */
+ if (dp->cdr_dstat->ds_dr_cur_rspeed == 0)
dp->cdr_dstat->ds_dr_cur_rspeed = 1385;
dp->cdr_dstat->ds_dr_max_wspeed = a_to_u_2_byte(mp->max_write_speed)/1385;
More information about the Debburn-changes
mailing list