Nur in scez-new/apps: .deps.
Nur in scez-new/apps: Makefile.
Nur in scez-new/: config.cache.
Nur in scez-new/: config.h.
Nur in scez-new/: config.log.
Nur in scez-new/: config.status.
Nur in scez-new/doc: Makefile.
Nur in scez-new/doc: scez.info.
Nur in scez-new/: libtool.
Nur in scez-new/: Makefile.
Nur in scez-new/scez: .deps.
Nur in scez-new/scez: Makefile.
diff -ur scez-20020621/scez/scbasiccard.c scez-new/scez/scbasiccard.c
--- scez-20020621/scez/scbasiccard.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/scbasiccard.c	2004-09-04 22:19:36.000000000 +0200
@@ -328,16 +328,16 @@
 				(des_cblock *)ci->crypt.iv, DES_ENCRYPT );
 #endif /* HAVE_LIBCRYPTO */
 		else {
-			memset( ks1, 0, sizeof(ks1) );
-			memset( ks2, 0, sizeof(ks2) );
-			memset( ba, 0, sizeof(ba) );
-			memset( baout, 0, sizeof(baout) );
+			memset( &ks1, 0, sizeof(ks1) );
+			memset( &ks2, 0, sizeof(ks2) );
+			memset( &ba, 0, sizeof(ba) );
+			memset( &baout, 0, sizeof(baout) );
 
 			return( SC_EXIT_BAD_PARAM );
 		}
 
-		memset( ks1, 0, sizeof(ks1) );
-		memset( ks2, 0, sizeof(ks2) );
+		memset( &ks1, 0, sizeof(ks1) );
+		memset( &ks2, 0, sizeof(ks2) );
 
 		if(m) memcpy( baout+(blocks*8)-16+m, baout+(blocks*8)-8, 8 );
 		if( (apdu->cse==SC_APDU_CASE_2_SHORT ) ||
@@ -453,10 +453,10 @@
 				(des_cblock *)ci->crypt.iv, DES_DECRYPT );
 #endif /* HAVE_LIBCRYPTO */
 		else {
-			memset( ks1, 0, sizeof(ks1) );
-			memset( ks2, 0, sizeof(ks2) );
-			memset( ba, 0, sizeof(ba) );
-			memset( baout, 0, sizeof(baout) );
+			memset( &ks1, 0, sizeof(ks1) );
+			memset( &ks2, 0, sizeof(ks2) );
+			memset( &ba, 0, sizeof(ba) );
+			memset( &baout, 0, sizeof(baout) );
 
 			return( SC_EXIT_BAD_PARAM );
 		}
@@ -495,8 +495,8 @@
 			}
 		}
 
-		memset( ks1, 0, sizeof(ks1) );
-		memset( ks2, 0, sizeof(ks2) );
+		memset( &ks1, 0, sizeof(ks1) );
+		memset( &ks2, 0, sizeof(ks2) );
 
 		/* Copy IV. */
 		memcpy( ci->crypt.iv, iv, 8 );
diff -ur scez-20020621/scez/sccryptoflex.c scez-new/scez/sccryptoflex.c
--- scez-20020621/scez/sccryptoflex.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/sccryptoflex.c	2004-09-04 22:21:08.000000000 +0200
@@ -109,8 +109,8 @@
 
 	memcpy( auth, out, 6 );
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( out, 0, sizeof(out) );
 #endif /* WITH_DES */
 }
@@ -137,8 +137,8 @@
 		des_ecb_encrypt( (des_cblock *) chall, &out, schedule, DES_ENCRYPT );
 	}
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 
 	if( memcmp( auth, out, 6 ) ) return( FALSE );
 
@@ -247,8 +247,8 @@
 	/* Copy cryptogram */
 	memcpy( mac+5+tmp-3, out, 6 );
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( in, 0, sizeof(in) );
 	memset( out, 0, sizeof(out) );
 	memset( block, 0, sizeof(block) );
@@ -1914,8 +1914,8 @@
 		return( SC_EXIT_NOT_SUPPORTED );
 	}
 
-	memset( ks1, 0, sizeof(ks1) );
-	memset( ks2, 0, sizeof(ks2) );
+	memset( &ks1, 0, sizeof(ks1) );
+	memset( &ks2, 0, sizeof(ks2) );
 
 	ret=scReaderSendAPDU( ri, ci, &apdu );
 	memset( cmd, 0, sizeof(cmd) );
diff -ur scez-20020621/scez/sccyberflex.c scez-new/scez/sccyberflex.c
--- scez-20020621/scez/sccyberflex.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/sccyberflex.c	2004-09-04 22:22:23.000000000 +0200
@@ -110,8 +110,8 @@
 
 	memcpy( auth, out, 8 );
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( out, 0, sizeof(out) );
 #endif /* WITH_DES */
 }
@@ -138,8 +138,8 @@
 		des_ecb_encrypt( (des_cblock *) chall, &out, schedule, DES_DECRYPT );
 	}
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 
 	if( memcmp( auth, out, 8 ) ) return( FALSE );
 
@@ -198,8 +198,8 @@
 
 	memcpy( auth, out, *authlen );
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( in, 0, sizeof(in) );
 	memset( out, 0, sizeof(out) );
 #else
diff -ur scez-20020621/scez/scgpk4000.c scez-new/scez/scgpk4000.c
--- scez-20020621/scez/scgpk4000.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/scgpk4000.c	2004-09-04 22:27:40.000000000 +0200
@@ -151,8 +151,8 @@
 
 	memcpy( auth, out, 4 );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 	memset( out, 0, sizeof(out) );
 #endif /* WITH_DES */
 }
@@ -173,8 +173,8 @@
 	des_set_key( (des_cblock *) (key+8), k2 );
 	des_ecb3_encrypt( (des_cblock *) chall, &out, k1, k2, k1, DES_ENCRYPT );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 
 	if( memcmp( auth, out+4, 4 ) ) return( FALSE );
 
@@ -213,8 +213,8 @@
 
 	des_ecb3_encrypt( (des_cblock *)chall, &out, k1, k2, k1, DES_ENCRYPT );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 
 	/* Check cryptogram */
 	if( memcmp( r_rn, out+4, 4 )!=0 ) return( FALSE );
@@ -258,8 +258,8 @@
 
 	des_ecb3_encrypt( (des_cblock *)chall, &out, k1, k2, k1, DES_ENCRYPT );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 	memset( ctc, 0, sizeof(ctc) );
 
 	/* Check cryptogram */
@@ -319,8 +319,8 @@
 	if( crycks0!=NULL ) memcpy( crycks0, out+5, 3 );
 	if( crycks1!=NULL ) memcpy( crycks1, out, 3 );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 	memset( in, 0, sizeof(in) );
 	memset( out, 0, sizeof(out) );
 	memset( block, 0, sizeof(block) );
@@ -360,8 +360,8 @@
 
 	des_ecb3_encrypt( (des_cblock *)in, &out, k1, k2, k1, DES_ENCRYPT );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 	memset( kt1, 0, sizeof(kt1) );
 	memset( kt2, 0, sizeof(kt2) );
 	memset( in, 0, sizeof(in) );
@@ -1652,8 +1652,8 @@
 
 	memcpy( crycks, tmp+8, 3 );
 
-	memset( ks1, 0, sizeof(ks1) );
-	memset( ks2, 0, sizeof(ks2) );
+	memset( &ks1, 0, sizeof(ks1) );
+	memset( &ks2, 0, sizeof(ks2) );
 	memset( tmp, 0, sizeof(tmp) );
 
 	ret=scReaderSendAPDU( ri, ci, &apdu );
@@ -1829,8 +1829,8 @@
 	des_ecb2_encrypt( (des_cblock *)sc, (des_cblock *)(cmd+5), ks1, ks2,
 		DES_DECRYPT );
 
-	memset( ks1, 0, sizeof(ks1) );
-	memset( ks2, 0, sizeof(ks2) );
+	memset( &ks1, 0, sizeof(ks1) );
+	memset( &ks2, 0, sizeof(ks2) );
 
 	ret=scReaderSendAPDU( ri, ci, &apdu );
 	memset( cmd, 0, sizeof(cmd) );
@@ -1999,8 +1999,8 @@
 
 	memcpy( crycks, tmp+8, 3 );
 
-	memset( ks1, 0, sizeof(ks1) );
-	memset( ks2, 0, sizeof(ks2) );
+	memset( &ks1, 0, sizeof(ks1) );
+	memset( &ks2, 0, sizeof(ks2) );
 	memset( tmp, 0, sizeof(tmp) );
 
 	ret=scReaderSendAPDU( ri, ci, &apdu );
@@ -2071,8 +2071,8 @@
 	memcpy( cmd+6, last, 3 );
 	memcpy( cmd+9, out, 8 );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 	memset( in, 0, sizeof(in) );
 	memset( out, 0, sizeof(out) );
 
@@ -2161,8 +2161,8 @@
 	memcpy( cmd+6, credit, 3 );
 	memcpy( cmd+9, in, 8 );
 
-	memset( k1, 0, sizeof(k1) );
-	memset( k2, 0, sizeof(k2) );
+	memset( &k1, 0, sizeof(k1) );
+	memset( &k2, 0, sizeof(k2) );
 	memset( kt1, 0, sizeof(kt1) );
 	memset( kt2, 0, sizeof(kt2) );
 	memset( in, 0, sizeof(in) );
@@ -2234,8 +2234,8 @@
 
 		des_ecb3_encrypt( (des_cblock *)in, &out, k1, k2, k1, DES_ENCRYPT );
 
-		memset( k1, 0, sizeof(k1) );
-		memset( k2, 0, sizeof(k2) );
+		memset( &k1, 0, sizeof(k1) );
+		memset( &k2, 0, sizeof(k2) );
 		memset( in, 0, sizeof(in) );
 
 		if( !memcmp( out, rsp, 2 ) ) {
@@ -2306,8 +2306,8 @@
 
 		memcpy( balance, rsp+1, 3 );
 
-		memset( k1, 0, sizeof(k1) );
-		memset( k2, 0, sizeof(k2) );
+		memset( &k1, 0, sizeof(k1) );
+		memset( &k2, 0, sizeof(k2) );
 		memset( in, 0, sizeof(in) );
 
 		if( !memcmp( out+2, rsp+4, 2 ) ) {
diff -ur scez-20020621/scez/scmfc.c scez-new/scez/scmfc.c
--- scez-20020621/scez/scmfc.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/scmfc.c	2004-09-04 22:28:05.000000000 +0200
@@ -104,8 +104,8 @@
 
 	memcpy( auth, out, 8 );
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( out, 0, sizeof(out) );
 #endif /* WITH_DES */
 }
@@ -132,8 +132,8 @@
 		des_ecb_encrypt( (des_cblock *) chall, &out, schedule, DES_ENCRYPT );
 	}
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 
 	if( memcmp( auth, out, 8 ) ) return( FALSE );
 
diff -ur scez-20020621/scez/scmultiflex.c scez-new/scez/scmultiflex.c
--- scez-20020621/scez/scmultiflex.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/scmultiflex.c	2004-09-04 22:28:15.000000000 +0200
@@ -132,7 +132,7 @@
 	des_set_key( (des_cblock *) key, schedule );
 	des_ecb_encrypt( (des_cblock *) chall, &out, schedule, DES_ENCRYPT );
 
-	memset( schedule, 0, sizeof(schedule) );
+	memset( &schedule, 0, sizeof(schedule) );
 
 	if( memcmp( auth, out, 6 ) ) return( FALSE );
 
diff -ur scez-20020621/scez/scpayflex.c scez-new/scez/scpayflex.c
--- scez-20020621/scez/scpayflex.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/scpayflex.c	2004-09-04 22:28:36.000000000 +0200
@@ -95,8 +95,8 @@
 
 	memcpy( auth, out, 6 );
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( out, 0, sizeof(out) );
 #endif /* WITH_DES */
 }
@@ -123,8 +123,8 @@
 		des_ecb_encrypt( (des_cblock *) chall, &out, schedule, DES_ENCRYPT );
 	}
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 
 	if( memcmp( auth, out, 6 ) ) return( FALSE );
 
diff -ur scez-20020621/scez/scsmartcafe.c scez-new/scez/scsmartcafe.c
--- scez-20020621/scez/scsmartcafe.c	2002-06-21 17:12:41.000000000 +0200
+++ scez-new/scez/scsmartcafe.c	2004-09-04 22:30:49.000000000 +0200
@@ -81,11 +81,11 @@
 	if( (encalgo==SC_SMARTCAFE_ALGO_3DES) && (enckey!=NULL) ) {
 		des_set_key( (des_cblock *) enckey, schedule );
 		des_set_key( (des_cblock *) (enckey+8), schedule2 );
-		des_ede2_cbc_encrypt( (des_cblock *)data, (des_cblock *)data,
+		des_ede2_cbc_encrypt( (void *)data, (void *)data,
 			*datalen, schedule, schedule2, (des_cblock *) in, DES_ENCRYPT );
 	} else if( (encalgo==SC_SMARTCAFE_ALGO_DES) && (enckey!=NULL) ) {
 		des_set_key( (des_cblock *) enckey, schedule );
-		des_cbc_encrypt( (des_cblock *)data, (des_cblock *)data,
+		des_cbc_encrypt( (void *)data, (void *)data,
 			*datalen, schedule, (des_cblock *) in, DES_ENCRYPT );
 	}
 
@@ -125,8 +125,8 @@
 	memcpy( data+*datalen, in, 8 );
 	*datalen+=8;
 
-	memset( schedule, 0, sizeof(schedule) );
-	memset( schedule2, 0, sizeof(schedule2) );
+	memset( &schedule, 0, sizeof(schedule) );
+	memset( &schedule2, 0, sizeof(schedule2) );
 	memset( in, 0, sizeof(in) );
 	memset( out, 0, sizeof(out) );
 
Nur in scez-new/sio: .deps.
Nur in scez-new/sio: Makefile.
Nur in scez-new/: stamp-h.
Nur in scez-new/test: .deps.
Nur in scez-new/test: Makefile.
