ascii dump on xchacha20 to compare against x86 version

diff --git a/crypto/chacha20/Makefile b/crypto/chacha20/Makefile
index ef18a75a3c764e74292cfef810870de73c06aefa..fb64bfa51d06bf051acf94a3ae058ba6dc88c007 100644 (file)
--- a/crypto/chacha20/Makefile
+++ b/crypto/chacha20/Makefile
@@ -10,7 +10,7 @@ LFLAGS = -Wall
 
 SRCDIR = src
 
-SOURCES        := $(wildcard $(SRCDIR)/*.c)
+SOURCES        := $(SRCDIR)/xchacha20.c $(SRCDIR)/test.c
 INCLUDES       := $(wildcard $(SRCDIR)/*.h))
 OBJECTS        := $(SOURCES:$(SRCDIR)/%.c=$(SRCDIR)/%.o)
 

diff --git a/crypto/chacha20/src/svp64test.c b/crypto/chacha20/src/svp64test.c
index 3e08113739f835a983ef75a93b963dfb466a73c6..d12af4b65dfbf1e05e246838977524b1f3b2ad1b 100644 (file)
--- a/crypto/chacha20/src/svp64test.c
+++ b/crypto/chacha20/src/svp64test.c
@@ -59,7 +59,9 @@ int check_cpp(void){
        uint8_t plaintext[] = "My Plaintext!! My Dear plaintext!!!";
        uint32_t msglen = strlen((char *)plaintext);
 
+    /* knock one byte off the end */
     plaintext[msglen-1] = 0;
+    msglen -= 1;
 
        xchacha_keysetup(&ctx, key, iv);
 

diff --git a/crypto/chacha20/src/test.c b/crypto/chacha20/src/test.c
index 2dfa4c1ae670de9ed7cbef2e9676ccf0196884ab..9562fbf301e48f0f4335812c8b710672cb3fa7f7 100644 (file)
--- a/crypto/chacha20/src/test.c
+++ b/crypto/chacha20/src/test.c
@@ -45,9 +45,13 @@ int check_cpp(void){
                        0x6C, 0x72
        };
 
-       uint8_t plaintext[] = "My Plaintext!! My Dear plaintext!!";
+       uint8_t plaintext[] = "My Plaintext!! My Dear plaintext!!!";
        uint32_t msglen = strlen((char *)plaintext);
 
+    /* knock one byte off the end */
+    plaintext[msglen-1] = 0;
+    msglen -= 1;
+
        /* Allocate a buffer to hold our calculated ciphertext */
        if((buffer = malloc(50 * sizeof(uint8_t))) == NULL){
                perror("malloc() error");

diff --git a/src/openpower/decoder/isa/pypowersim.py b/src/openpower/decoder/isa/pypowersim.py
index bcbf8e9fb10c61f27e55995c8391b3d50900b496..4cb32a6b57475fc4bdb1e6f7bd1240a038dd6dcf 100644 (file)
--- a/src/openpower/decoder/isa/pypowersim.py
+++ b/src/openpower/decoder/isa/pypowersim.py
@@ -405,7 +405,7 @@ def run_simulation():
         print ("SPRs")
         simulator.spr.dump()
         print ("Mem")
-        simulator.mem.dump()
+        simulator.mem.dump(asciidump=True)
 
         for fname, offs, length in write_to:
             write_data(simulator.mem, fname, offs, length)