Make it build and test.

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 0aaaf9a38e3c02779947897c141e8fcd317e12c7..00c7b2f17d96bab4fc931de85c38ea387b0d7788 100644 (file)
--- a/crypto/evp/Makefile
+++ b/crypto/evp/Makefile
@@ -13,7 +13,7 @@ AR=           ar r
 CFLAGS= $(INCLUDES) $(CFLAG)
 
 GENERAL=Makefile
-TEST=evp_test.c
+TEST=evp_test.c aeadtest.c
 TESTDATA=evptests.txt
 APPS=
 

diff --git a/crypto/evp/aeadtest.c b/crypto/evp/aeadtest.c
index b099ca55e95ddef2ff2ee18f6eb15524854114fd..e1d83bedb4dc08b58b2cd4d7e0f103b23dcc7865 100644 (file)
--- a/crypto/evp/aeadtest.c
+++ b/crypto/evp/aeadtest.c
@@ -84,7 +84,7 @@ enum
        CT,       /* hex encoded ciphertext (not including the authenticator,
                     which is next. */
        TAG,      /* hex encoded authenticator. */
-       NUM_TYPES,
+       NUM_TYPES
        };
 
 static const char NAMES[6][NUM_TYPES] =
@@ -257,7 +257,7 @@ int main(int argc, char **argv)
                unsigned int i, type_len = 0;
 
                unsigned char *buf = NULL;
-               unsigned int *buf_len;
+               unsigned int *buf_len = NULL;
 
                if (!fgets(line, sizeof(line), f))
                        break;

diff --git a/crypto/poly1305/Makefile b/crypto/poly1305/Makefile
index 397d7cd35dff5827e323cdaf6fcda5357092cc3d..6fdb1c3a176e42346b0bfa29a1f5bc90520a9b63 100644 (file)
--- a/crypto/poly1305/Makefile
+++ b/crypto/poly1305/Makefile
@@ -17,7 +17,7 @@ ASFLAGS= $(INCLUDES) $(ASFLAG)
 AFLAGS= $(ASFLAGS)
 
 GENERAL=Makefile
-TEST=
+TEST=poly1305test
 APPS=
 
 LIB=$(TOP)/libcrypto.a

diff --git a/crypto/poly1305/poly1305_vec.c b/crypto/poly1305/poly1305_vec.c
index c546200b9488a895ac7f2c9f6e1697eb8fa5c2a8..19b69ea6ee41b138ff8b7a0ba83769f547621c4d 100644 (file)
--- a/crypto/poly1305/poly1305_vec.c
+++ b/crypto/poly1305/poly1305_vec.c
@@ -47,6 +47,10 @@
  * ====================================================================
  */
 
+#ifdef PEDANTIC
+# include "poly1305.c"
+#else
+
 /* This implementation of poly1305 is by Andrew Moon
  * (https://github.com/floodyberry/poly1305-donna) and released as public
  * domain. It implements SIMD vectorization based on the algorithm described in
@@ -731,3 +735,5 @@ poly1305_donna_finish:
        }
 
 #endif  /* !OPENSSL_NO_POLY1305 */
+
+#endif  /* !PEDANTIC */

diff --git a/test/Makefile b/test/Makefile
index 40aada3023128ff8abcc3ef197c89edf955c1e1f..8c902dcd2906a6da11cdfb9c9fe7e2096ecdf38f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -345,7 +345,8 @@ test_poly1305: $(POLY1305TEST)$(EXE_EXT)
        @echo "Test Poly1305"
        ../util/shlib_wrap.sh ./$(POLY1305TEST)
 
-test_aead: $(AEADTEST)$(EXE_EXT)
+test_aead: $(AEADTEST)$(EXE_EXT) chacha20_poly1305_tests.txt \
+           aes_128_gcm_tests.txt aes_256_gcm_tests.txt
        @echo "Test ChaCha20+Poly1305"
        ../util/shlib_wrap.sh ./$(AEADTEST) chacha20-poly1305 \
                chacha20_poly1305_tests.txt

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 39bdc6c75e4fd0cd85466a2c032f11366ec3ab88..98da2c89a53d72c1aa592548b155e86b3da26b87 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -274,6 +274,7 @@ sub get_tests
   my %tests;
   my %alltests;
   my %fakes;
+  my $info = '';
   while (my $line = <M>)
     {
     chomp $line;
@@ -290,11 +291,18 @@ sub get_tests
        $targets{$t} = '';
        $alltests{$t} = undef;
         }
+      $info .= '# targets = ' . join(' ', sort keys %targets) . "\n";
+      }
+
+    if ($line =~ /^(?<t>\S+):(?<d>.*)$/ && !exists $targets{$1}) 
+      {
+      $info .= "# no match: $line\n";
       }
 
     if (($line =~ /^(?<t>\S+):(?<d>.*)$/ && exists $targets{$1})
        || $line =~ /^(?<t>test_(ss|gen) .*):(?<d>.*)/)
       {
+      $info .= "# match: $line\n";
       my $t = $+{t};
       my $d = $+{d};
       # If there are multiple targets stupid FreeBSD make runs the
@@ -399,6 +407,9 @@ sub get_tests
                 'testssl',
                 'testsslproxy',
                 'serverinfo.pem',
+                'chacha20_poly1305_tests.txt',
+                'aes_128_gcm_tests.txt',
+                'aes_256_gcm_tests.txt',
               );
   my $copies = copy_scripts(1, 'test', @copies);
   $copies .= copy_scripts(0, 'test', ('smcont.txt'));
@@ -433,7 +444,7 @@ sub get_tests
       }
     }
 
-  return "$scripts\n$copies\n$tests\n$all\n\n$each";
+  return "$info\n$scripts\n$copies\n$tests\n$all\n\n$each";
   }
 
 1;