test debugging now ..

Author: rageworx

Makefile

@@ -24,8 +24,8 @@ LZMATDIR  = ${SOURCEDIR}/lzmat
 OBJDIR    = ./obj
 OUTBIN    = libendetool.a
 DEFINEOPT = -D_GNU_SOURCE
-OPTIMOPT  = -O2 -fomit-frame-pointer -ffast-math
-#OPTIMOPT  =  -g3 -O2 -DDEBUG
+#OPTIMOPT  = -O2 -fomit-frame-pointer -ffast-math
+OPTIMOPT  =  -g3 -O2 -DDEBUG
 OPTADD    = 
 OPTARCH   =
 

src/endetool.cpp

@@ -232,12 +232,24 @@ long long EnDeTool::decodebinary( const char* src, unsigned srcsize, char* &out
     }
 
     // checks is it compressed ..
-    if ( memcmp( &decptr[4], &LZMAT_COMPRESS_HEADER, 4 ) == 0 )
+    if ( memcmp( decptr, &LZMAT_COMPRESS_HEADER, 4 ) == 0 )
     {
+#ifdef DEBUG
+        printf( "data compressed!\n" );
+        fflush( stdout );
+#endif /// of DEBUG        
         unsigned worksz = srcsize - 4;
 
         // reallocate buffer for decompress buffer.
+#ifdef DEBUG
+        printf( "decompressing ... " );
+        fflush( stdout );
+#endif /// of DEBUG 
         decbuffsz = decompressbuffer( decptr, worksz );
+#ifdef DEBUG
+        printf( "%u bytes\n", decbuffsz );
+        fflush( stdout );
+#endif /// of DEBUG 
 
         if ( decbuffsz < AES_BLOCKLEN )
         {

test/test.cpp

@@ -9,7 +9,6 @@ using namespace std;
 
 const char ekey[] = "12345678901234567890123456789012";
 const char eiv[]  = "09876543210987654321098765432109";
-//const char teststr[] = "Testing_source_words_for_libendetool_and_endecmd.";
 const char teststr[] = "Testing_source_words_for_libendetool_and_endecmd.";
 
 void test1()
@@ -22,9 +21,8 @@ void test1()
         printf( "Ok.\n" );
         printf( "> Configure : " );
         fflush( stdout );
-        //ende.cryptkey( ekey, eiv );
         ende->compress( false );
-        ende->cryptkey( ekey );
+        ende->cryptkey( ekey, eiv );
 
         printf( "Ok.\n" );
         fflush( stdout );
@@ -33,7 +31,12 @@ void test1()
         fflush( stdout );
 
         ende->text( teststr );
-        string encstr = ende->encodedtext();
+        printf( "> encoding ... " );
+        fflush( stdout );
+        string encstr;
+        const char* rets = ende->encodedtext();
+        if ( rets != NULL )
+            encstr = rets;
         printf( "> encoded : %s\n", encstr.c_str() );
         fflush( stdout );
 
@@ -57,9 +60,10 @@ void test2()
     if ( ende != NULL )
     {
         ende->compress( true );
-        ende->cryptkey( ekey );
+        ende->cryptkey( ekey, eiv );
 
         printf( "testing compressed encryption\n" );
+        fflush( stdout );
 
         ende->text( teststr );
         string encstr = ende->encodedtext();
@@ -77,14 +81,19 @@ int main( int argc, char** argv )
     printf( "libendetool testing.\n" );
     fflush( stdout );
 
+    printf( "========================================================\n" );
     printf( "TESTING 1: plain texts.\n");
     fflush( stdout );
     test1();
 
+    printf( "\n\n" );
+    printf( "========================================================\n" );
     printf( "TESTING 2: compressed texts.\n" );
     fflush( stdout );
     test2();
 
+    printf( "\n\n" );
+    printf( "========================================================\n" );
     fflush( stdout );
     system( "pause" );