resolve conflicts

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/libcrypto/evp/evp_test.c b/src/lib/libcrypto/evp/evp_test.c
index bb6f02c2e9..436be20bf1 100644
--- a/src/lib/libcrypto/evp/evp_test.c
+++ b/src/lib/libcrypto/evp/evp_test.c
@@ -220,18 +220,18 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
             test1_exit(7);
             }
 
-        if(outl+outl2 != cn)
+        if(outl+outl2 != pn)
             {
             fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
-                    outl+outl2,cn);
+                    outl+outl2,pn);
             test1_exit(8);
             }
 
-        if(memcmp(out,plaintext,cn))
+        if(memcmp(out,plaintext,pn))
             {
             fprintf(stderr,"Plaintext mismatch\n");
-            hexdump(stderr,"Got",out,cn);
-            hexdump(stderr,"Expected",plaintext,cn);
+            hexdump(stderr,"Got",out,pn);
+            hexdump(stderr,"Expected",plaintext,pn);
             test1_exit(9);
             }
         }