You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2006/06/06 12:48:18 UTC
svn commit: r412072 - in /webservices/axis2/trunk/c/util/src/minizip:
Makefile.am archive_extract.c axis2_crypt.h
Author: pini
Date: Tue Jun 6 03:48:18 2006
New Revision: 412072
URL: http://svn.apache.org/viewvc?rev=412072&view=rev
Log:
fixed warnings
Modified:
webservices/axis2/trunk/c/util/src/minizip/Makefile.am
webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
webservices/axis2/trunk/c/util/src/minizip/axis2_crypt.h
Modified: webservices/axis2/trunk/c/util/src/minizip/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/Makefile.am?rev=412072&r1=412071&r2=412072&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/src/minizip/Makefile.am Tue Jun 6 03:48:18 2006
@@ -2,8 +2,9 @@
libaxis2_minizip_la_SOURCES = ioapi.c \
- unzip.c \
- archive_extract.c
+ unzip.c \
+ archive_extract.c \
+ crypt.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/platforms
Modified: webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/archive_extract.c?rev=412072&r1=412071&r2=412072&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/archive_extract.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/archive_extract.c Tue Jun 6 03:48:18 2006
@@ -247,7 +247,6 @@
int opt_extractdir=0;
const axis2_char_t *dir_name=NULL;
unzFile uf=NULL;
- zlib_filefunc_def ffunc;
if (zipfilename == NULL)
zipfilename = d_name;
@@ -259,13 +258,13 @@
strncpy(filename_try, zipfilename,MAXFILENAME-1);
filename_try[ MAXFILENAME ] = '\0';
- axis2_fill_win32_filefunc(&ffunc);
- uf = AXIS2_UNZOPEN2(zipfilename,ffunc);
+ axis2_fill_win32_filefunc(&zlib_filefunc_def);
+ uf = AXIS2_UNZOPEN2(zipfilename,zlib_filefunc_def);
if (uf==NULL)
{
strcat(filename_try,".zip");
- uf = AXIS2_UNZOPEN2(zipfilename,ffunc);
+ uf = AXIS2_UNZOPEN2(zipfilename,zlib_filefunc_def);
}
}
Modified: webservices/axis2/trunk/c/util/src/minizip/axis2_crypt.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/axis2_crypt.h?rev=412072&r1=412071&r2=412072&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/axis2_crypt.h (original)
+++ webservices/axis2/trunk/c/util/src/minizip/axis2_crypt.h Tue Jun 6 03:48:18 2006
@@ -48,46 +48,18 @@
/***********************************************************************
* Return the next byte in the pseudo-random sequence
*/
-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
-{
- unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
- * unpredictable manner on 16-bit systems; not a problem
- * with any known compiler so far, though */
-
- temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
- return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
+int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab);
/***********************************************************************
* Update the encryption keys with the next byte of plain text
*/
-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
-{
- (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
- (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
- (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
- {
- register int keyshift = (int)((*(pkeys+1)) >> 24);
- (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
- }
- return c;
-}
-
+int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c);
/***********************************************************************
* Initialize the encryption keys and the random header according to
* the given password.
*/
-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
-{
- *(pkeys+0) = 305419896L;
- *(pkeys+1) = 591751049L;
- *(pkeys+2) = 878082192L;
- while (*passwd != '\0') {
- update_keys(pkeys,pcrc_32_tab,(int)*passwd);
- passwd++;
- }
-}
+void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab);
#define zdecode(pkeys,pcrc_32_tab,c) \
(update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
@@ -103,46 +75,7 @@
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
# endif
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
- const char *passwd; /* password string */
- unsigned char *buf; /* where to write header */
- int bufSize;
- unsigned long* pkeys;
- const unsigned long* pcrc_32_tab;
- unsigned long crcForCrypting;
-{
- int n; /* index in random header */
- int t; /* temporary */
- int c; /* random byte */
- unsigned char header[RAND_HEAD_LEN-2]; /* random header */
- static unsigned calls = 0; /* ensure different random header each time */
-
- if (bufSize<RAND_HEAD_LEN)
- return 0;
-
- /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
- * output of rand() to get less predictability, since rand() is
- * often poorly implemented.
- */
- if (++calls == 1)
- {
- srand((unsigned)(time(NULL) ^ ZCR_SEED2));
- }
- init_keys(passwd, pkeys, pcrc_32_tab);
- for (n = 0; n < RAND_HEAD_LEN-2; n++)
- {
- c = (rand() >> 7) & 0xff;
- header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
- }
- /* Encrypt random header (last two bytes is high word of crc) */
- init_keys(passwd, pkeys, pcrc_32_tab);
- for (n = 0; n < RAND_HEAD_LEN-2; n++)
- {
- buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
- }
- buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
- buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
- return n;
-}
+int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting);
+
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org