Merge branch 'dev'

RNCryptor · Jun 2, 2015 · 045c9d4 · 045c9d4
2 parents 3ef75fd + 5b2322b
commit 045c9d4
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 392 deletions.
diff --git a/ChangeLog.asc b/ChangeLog.asc
@@ -1,5 +1,11 @@
 = ChangeLog file for RNCryptor-C
 
+= v1.03
+* Uses less memory, removed duplicate code. Lots of Code cleanup.
+* Updated RNCryptor-C link
+
+(Jun-01-2015)
+
 = v1.02
 * Implemented function +rncryptorc_encrypt_data_with_password_with_salts_and_iv()+ so that caller can pass encryption salt, hmac salt and iv.
 

diff --git a/Makefile b/Makefile
@@ -73,7 +73,7 @@ gen_tester:
 	$(CC) $(CFLAGS) tests/test_with_test_vectors.c -o tests/test_with_test_vectors $(LIBS)
 
 # sanity test
-test_simple:
+test_simple:examples
 	+ruby tests/test.rb
 
 # test code must be pre-generated with target gen_test_vector_code

diff --git a/Makefile.in b/Makefile.in
@@ -73,7 +73,7 @@ gen_tester:
 	$(CC) $(CFLAGS) tests/test_with_test_vectors.c -o tests/test_with_test_vectors $(LIBS)
 
 # sanity test
-test_simple:
+test_simple:examples
 	+ruby tests/test.rb
 
 # test code must be pre-generated with target gen_test_vector_code

diff --git a/README.asc b/README.asc
@@ -25,7 +25,7 @@ Please look at the <<apis,APIs>> section for details.
 It should compile on any POSIX compliant system.  Works on 64 bit systems.
 
 == Versions
-Latest stable version is 1.02. Please look at https://github.com/RNCryptor/RNCryptor-C/blob/master/ChangeLog.asc[ChangeLog] for changes.
+Latest stable version is 1.03. Please look at the https://github.com/RNCryptor/RNCryptor-C/blob/master/ChangeLog.asc[ChangeLog] for details on changes.
 
 == Downloads
 
@@ -697,7 +697,7 @@ int rncryptorc_write_file(const char *outfile_path,const unsigned char *data,int
 **
 **  Parameters:
 **      d      Debug value. 1 or 0. To print the debug messages to stdout,
-**             call the funtion with 1 before calling any API 
+**             call the function with 1 before calling any API 
 **
 **  Return Values:
 **      None

diff --git a/rn_encrypt_with_key.c b/rn_encrypt_with_key.c
@@ -66,6 +66,7 @@ int main(int argc,char *argv[])
     }
 
     memset(errbuf,0,sizeof(errbuf));
+    rncryptorc_set_debug(1);
     outdata = rncryptorc_encrypt_file_with_key(plain_file,
             RNCRYPTOR3_KDF_ITER,
             encr_key,