apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1765379 - in /apr/apr-util/branches/1.6.x: ./ build/ crypto/ include/ test/
Date Mon, 17 Oct 2016 22:42:15 GMT
Author: ylavic
Date: Mon Oct 17 22:42:15 2016
New Revision: 1765379

URL: http://svn.apache.org/viewvc?rev=1765379&view=rev
Log:
Merge r1763672, r1763673, r1763843, r1765378 from trunk:

Provide apr_siphash*() functions family.

Follow up to r1763672: remove debug triks :p

siphash: follow up to r1763672.
apr_crypto_equals() has its own test now.

Follow up to r1763672: missing nw_export.h update.

Added:
    apr/apr-util/branches/1.6.x/crypto/apr_siphash.c
      - copied unchanged from r1763672, apr/apr/trunk/crypto/apr_siphash.c
    apr/apr-util/branches/1.6.x/include/apr_siphash.h
      - copied unchanged from r1763672, apr/apr/trunk/include/apr_siphash.h
    apr/apr-util/branches/1.6.x/test/testsiphash.c
      - copied, changed from r1763672, apr/apr/trunk/test/testsiphash.c
Modified:
    apr/apr-util/branches/1.6.x/   (props changed)
    apr/apr-util/branches/1.6.x/CHANGES
    apr/apr-util/branches/1.6.x/CMakeLists.txt
    apr/apr-util/branches/1.6.x/NWGNUmakefile
    apr/apr-util/branches/1.6.x/aprutil.dep
    apr/apr-util/branches/1.6.x/aprutil.dsp
    apr/apr-util/branches/1.6.x/aprutil.mak
    apr/apr-util/branches/1.6.x/build.conf
    apr/apr-util/branches/1.6.x/build/nw_apu_export.inc
    apr/apr-util/branches/1.6.x/crypto/   (props changed)
    apr/apr-util/branches/1.6.x/libaprutil.dep
    apr/apr-util/branches/1.6.x/libaprutil.dsp
    apr/apr-util/branches/1.6.x/libaprutil.mak
    apr/apr-util/branches/1.6.x/test/Makefile.in
    apr/apr-util/branches/1.6.x/test/NWGNUaputest
    apr/apr-util/branches/1.6.x/test/abts_tests.h
    apr/apr-util/branches/1.6.x/test/testutil.h

Propchange: apr/apr-util/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 22:42:15 2016
@@ -1,4 +1,4 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763842
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751567,1751806,1751898,1752008,1763665,1763667,1763669,1763672-1763673,1763842-1763843,1765378
 /apr/apr-util/branches/1.3.x:896410,1154885
 /apr/apr-util/branches/1.4.x:1126217,1211211,1211219,1211223,1211330
 /apr/apr-util/branches/1.5.x:1757430

Modified: apr/apr-util/branches/1.6.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/CHANGES?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.6.x/CHANGES [utf-8] Mon Oct 17 22:42:15 2016
@@ -1,6 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.6.0
 
+  *) apr_siphash: Implement keyed hash function SipHash.  [Yann Ylavic]
+
   *) apr_crypto: Add apr_crypto_key() function which supports keys
      generated from a passphrase or a raw secret provided by the caller.
      Deprecate apr_crypto_passphrase(). [Graham Leggett]

Modified: apr/apr-util/branches/1.6.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/CMakeLists.txt?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.6.x/CMakeLists.txt Mon Oct 17 22:42:15 2016
@@ -122,6 +122,7 @@ SET(APR_PUBLIC_HEADERS_STATIC
   include/apr_rmm.h
   include/apr_sdbm.h
   include/apr_sha1.h
+  include/apr_siphash.h
   include/apr_strmatch.h
   include/apr_thread_pool.h
   include/apr_uri.h
@@ -158,6 +159,7 @@ SET(APR_SOURCES
   crypto/apr_md5.c
   crypto/apr_passwd.c
   crypto/apr_sha1.c
+  crypto/apr_siphash.c
   crypto/crypt_blowfish.c
   crypto/getuuid.c
   crypto/uuid.c

Modified: apr/apr-util/branches/1.6.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/NWGNUmakefile?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.6.x/NWGNUmakefile Mon Oct 17 22:42:15 2016
@@ -264,6 +264,7 @@ FILES_lib_objs = \
 	$(OBJDIR)/apr_reslist.o \
 	$(OBJDIR)/apr_rmm.o \
 	$(OBJDIR)/apr_sha1.o \
+	$(OBJDIR)/apr_siphash.o \
 	$(OBJDIR)/apu_version.o \
 	$(OBJDIR)/getuuid.o \
 	$(OBJDIR)/uuid.o \

Modified: apr/apr-util/branches/1.6.x/aprutil.dep
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/aprutil.dep?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.dep (original)
+++ apr/apr-util/branches/1.6.x/aprutil.dep Mon Oct 17 22:42:15 2016
@@ -104,6 +104,10 @@
 	".\include\apu.h"\
 	
 
+.\crypto\apr_siphash.c : \
+	".\include\apr_siphash.h"\
+	
+
 .\crypto\crypt_blowfish.c : \
 	".\crypto\crypt_blowfish.h"\
 	

Modified: apr/apr-util/branches/1.6.x/aprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/aprutil.dsp?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.dsp (original)
+++ apr/apr-util/branches/1.6.x/aprutil.dsp Mon Oct 17 22:42:15 2016
@@ -216,6 +216,10 @@ SOURCE=.\crypto\apr_sha1.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\crypto\apr_siphash.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\crypto\crypt_blowfish.c
 # End Source File
 # Begin Source File
@@ -775,6 +779,10 @@ SOURCE=.\include\apr_sha1.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_siphash.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_strmatch.h
 # End Source File
 # Begin Source File

Modified: apr/apr-util/branches/1.6.x/aprutil.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/aprutil.mak?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.mak (original)
+++ apr/apr-util/branches/1.6.x/aprutil.mak Mon Oct 17 22:42:15 2016
@@ -92,6 +92,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -172,6 +173,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -283,6 +285,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -368,6 +371,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -479,6 +483,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -564,6 +569,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -675,6 +681,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -760,6 +767,7 @@ LIB32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -927,6 +935,12 @@ SOURCE=.\crypto\apr_sha1.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\crypto\apr_siphash.c
+
+"$(INTDIR)\apr_siphash.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\crypto\crypt_blowfish.c
 
 "$(INTDIR)\crypt_blowfish.obj" : $(SOURCE) "$(INTDIR)"

Modified: apr/apr-util/branches/1.6.x/build.conf
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/build.conf?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/build.conf (original)
+++ apr/apr-util/branches/1.6.x/build.conf Mon Oct 17 22:42:15 2016
@@ -12,6 +12,7 @@ paths =
   crypto/apr_md5.c
   crypto/apr_passwd.c
   crypto/apr_sha1.c
+  crypto/apr_siphash.c
   crypto/getuuid.c
   crypto/uuid.c
   crypto/crypt_blowfish.c

Modified: apr/apr-util/branches/1.6.x/build/nw_apu_export.inc
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/build/nw_apu_export.inc?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/build/nw_apu_export.inc (original)
+++ apr/apr-util/branches/1.6.x/build/nw_apu_export.inc Mon Oct 17 22:42:15 2016
@@ -33,6 +33,7 @@
 #include "apr_rmm.h"
 #include "apr_sdbm.h"
 #include "apr_sha1.h"
+#include "apr_siphash.h"
 #include "apr_strmatch.h"
 #include "apr_thread_pool.h"
 #include "apr_uri.h"

Propchange: apr/apr-util/branches/1.6.x/crypto/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 22:42:15 2016
@@ -1,4 +1,4 @@
-/apr/apr/trunk/crypto:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1394552,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751806,1763665,1763667,1763669,1763842
+/apr/apr/trunk/crypto:781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,998533,1086937,1127053,1127648,1128838,1129433,1133587,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1327636,1340286,1346865,1357761,1357772,1357780,1357966,1357968,1357979,1358295,1358480,1361811,1362241,1362248,1362252,1362255,1363076,1369681,1370626,1371811,1371817,1371919,1371923,1382174,1389154,1389169,1390461,1390477,1394552,1402870,1402897,1402903,1402907,1406088,1422413,1425356,1426442,1426448,1438960,1449308,1449314,1460185,1460243-1460244,1462219,1462224,1484271,1493715,1495887,1495889,1496407,1516261,1523479,1529554,1531009,1541054,1543399,1544846,1618843,1619438,1625247,1626561,1648830,1711657,1722547,1728958,1728963,1747941,1751806,1763665,1763667,1763669,1763672,1763842
 /apr/apr-util/branches/1.3.x/crypto:896410,1154885
 /apr/apr-util/branches/1.4.x/crypto:1126217,1211211,1211219,1211223,1211330
 /apr/apr-util/trunk/crypto:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630,1626561

Modified: apr/apr-util/branches/1.6.x/libaprutil.dep
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/libaprutil.dep?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.dep (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.dep Mon Oct 17 22:42:15 2016
@@ -104,6 +104,10 @@
 	".\include\apu.h"\
 	
 
+.\crypto\apr_siphash.c : \
+	".\include\apr_siphash.h"\
+	
+
 .\crypto\crypt_blowfish.c : \
 	".\crypto\crypt_blowfish.h"\
 	

Modified: apr/apr-util/branches/1.6.x/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/libaprutil.dsp?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.dsp Mon Oct 17 22:42:15 2016
@@ -251,6 +251,10 @@ SOURCE=.\crypto\apr_sha1.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\crypto\apr_siphash.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\crypto\crypt_blowfish.c
 # End Source File
 # Begin Source File
@@ -822,6 +826,10 @@ SOURCE=.\include\apr_sha1.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_siphash.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_strmatch.h
 # End Source File
 # Begin Source File

Modified: apr/apr-util/branches/1.6.x/libaprutil.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/libaprutil.mak?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.mak (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.mak Mon Oct 17 22:42:15 2016
@@ -81,6 +81,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -169,6 +170,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -272,6 +274,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -364,6 +367,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -467,6 +471,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -559,6 +564,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -662,6 +668,7 @@ CLEAN :
 	-@erase "$(INTDIR)\apr_reslist.obj"
 	-@erase "$(INTDIR)\apr_rmm.obj"
 	-@erase "$(INTDIR)\apr_sha1.obj"
+	-@erase "$(INTDIR)\apr_siphash.obj"
 	-@erase "$(INTDIR)\apr_strmatch.obj"
 	-@erase "$(INTDIR)\apr_thread_pool.obj"
 	-@erase "$(INTDIR)\apr_uri.obj"
@@ -754,6 +761,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\apr_md5.obj" \
 	"$(INTDIR)\apr_passwd.obj" \
 	"$(INTDIR)\apr_sha1.obj" \
+	"$(INTDIR)\apr_siphash.obj" \
 	"$(INTDIR)\crypt_blowfish.obj" \
 	"$(INTDIR)\getuuid.obj" \
 	"$(INTDIR)\uuid.obj" \
@@ -924,6 +932,12 @@ SOURCE=.\crypto\apr_sha1.c
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+SOURCE=.\crypto\apr_siphash.c
+
+"$(INTDIR)\apr_siphash.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 SOURCE=.\crypto\crypt_blowfish.c
 
 "$(INTDIR)\crypt_blowfish.obj" : $(SOURCE) "$(INTDIR)"

Modified: apr/apr-util/branches/1.6.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/test/Makefile.in?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/test/Makefile.in (original)
+++ apr/apr-util/branches/1.6.x/test/Makefile.in Mon Oct 17 22:42:15 2016
@@ -17,7 +17,7 @@ STDTEST_PORTABLE = dbd testall
 TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
 	testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
 	testxml.lo testrmm.lo testreslist.lo testqueue.lo testxlate.lo \
-	testmemcache.lo testcrypto.lo
+	testmemcache.lo testcrypto.lo testsiphash.lo
 
 PROGRAMS = $(STDTEST_PORTABLE)
 

Modified: apr/apr-util/branches/1.6.x/test/NWGNUaputest
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/test/NWGNUaputest?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/test/NWGNUaputest (original)
+++ apr/apr-util/branches/1.6.x/test/NWGNUaputest Mon Oct 17 22:42:15 2016
@@ -185,6 +185,7 @@ FILES_nlm_objs = \
 	$(OBJDIR)/testqueue.o \
 	$(OBJDIR)/testreslist.o \
 	$(OBJDIR)/testrmm.o \
+	$(OBJDIR)/testsiphash.o \
 	$(OBJDIR)/teststrmatch.o \
 	$(OBJDIR)/testuri.o \
 	$(OBJDIR)/testutil.o \

Modified: apr/apr-util/branches/1.6.x/test/abts_tests.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/test/abts_tests.h?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/test/abts_tests.h (original)
+++ apr/apr-util/branches/1.6.x/test/abts_tests.h Mon Oct 17 22:42:15 2016
@@ -40,7 +40,8 @@ const struct testlist {
     {testrmm},
     {testdbm},
     {testqueue},
-    {testreslist}
+    {testreslist},
+    {testsiphash}
 };
 
 #endif /* APR_TEST_INCLUDES */

Copied: apr/apr-util/branches/1.6.x/test/testsiphash.c (from r1763672, apr/apr/trunk/test/testsiphash.c)
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/test/testsiphash.c?p2=apr/apr-util/branches/1.6.x/test/testsiphash.c&p1=apr/apr/trunk/test/testsiphash.c&r1=1763672&r2=1765379&rev=1765379&view=diff
==============================================================================
--- apr/apr/trunk/test/testsiphash.c (original)
+++ apr/apr-util/branches/1.6.x/test/testsiphash.c Mon Oct 17 22:42:15 2016
@@ -18,18 +18,18 @@
 #include <stdlib.h>
 
 #include "apr_siphash.h"
-#include "apr_crypto.h"
 
 #include "abts.h"
 #include "testutil.h"
 
-
 /*
  * Wrapped test vectors from the authors, see
  *  https://131002.net/siphash/siphash24.c
  */
-#define crypto_auth apr_siphash24_auth
 typedef unsigned char u8;
+#define crypto_auth apr_siphash24_auth
+
+#define MAXLEN 64
 
 /*
    SipHash-2-4 output with
@@ -42,7 +42,7 @@ typedef unsigned char u8;
    ...
    in = 00 01 02 ... 3e (63 bytes)
 */
-static u8 vectors[64][8] =
+static const u8 vectors[MAXLEN][8] =
 {
   { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, },
   { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, },
@@ -112,7 +112,6 @@ static u8 vectors[64][8] =
 
 static int test_vectors(void)
 {
-#define MAXLEN 64
   u8 in[MAXLEN], out[8], k[16];
   int i;
   int ok = 1;
@@ -129,29 +128,21 @@ static int test_vectors(void)
       printf( "test vector failed for %d bytes\n", i );
       ok = 0;
     }
-    /* added validation (basic) of apr_crypto_equals() */
-    else if ( !apr_crypto_equals(out, vectors[i], 8)
-              || apr_crypto_equals(out, vectors[(i + 1) % MAXLEN], 8) )
-    {
-      printf( "apr_crypto_equals() failed for %d bytes\n", i );
-      ok = 0;
-    }
   }
 
   return ok;
 }
 
-
-static void test_siphash(abts_case *tc, void *data)
+static void test_siphash_vectors(abts_case *tc, void *data)
 {
-    ABTS_ASSERT(tc, "test vectors", (test_vectors() != 0));
+    ABTS_ASSERT(tc, "SipHash-2-4 test vectors", test_vectors());
 }
 
 abts_suite *testsiphash(abts_suite *suite)
 {
     suite = ADD_SUITE(suite);
 
-    abts_run_test(suite, test_siphash, NULL);
+    abts_run_test(suite, test_siphash_vectors, NULL);
 
     return suite;
 }

Modified: apr/apr-util/branches/1.6.x/test/testutil.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/test/testutil.h?rev=1765379&r1=1765378&r2=1765379&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/test/testutil.h (original)
+++ apr/apr-util/branches/1.6.x/test/testutil.h Mon Oct 17 22:42:15 2016
@@ -67,5 +67,6 @@ abts_suite *testxml(abts_suite *suite);
 abts_suite *testxlate(abts_suite *suite);
 abts_suite *testrmm(abts_suite *suite);
 abts_suite *testdbm(abts_suite *suite);
+abts_suite *testsiphash(abts_suite *suite);
 
 #endif /* APR_TEST_INCLUDES */



Mime
View raw message