diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-09-08 20:24:25 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-09-08 20:24:25 -0400 |
| commit | 7f958575eaf267c8011e25dfbe6350b818524ff4 (patch) | |
| tree | aa9577e74e276b5ca88fb71d6cc09be1de2ea465 /mqv.cpp | |
| parent | 42085eea4194c10be60caab7ca3626ecb9716b19 (diff) | |
| download | cryptopp-git-7f958575eaf267c8011e25dfbe6350b818524ff4.tar.gz | |
Squashed commit of the following:
commit 47c75c6e9397e240919207e50e5a611d3e2a2428
Merge: d7685c2 42085ee
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 20:20:39 2016 -0400
Attempting to fix binary file merge conflict
commit d7685c2d946beecc419ddb6901c24e972c7cf3ee
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 16:39:23 2016 -0400
Add vsClean.cmd to vs2010.zip
commit 4b96fdf1c551260da60eb021f324bcc3fcfec626
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 16:15:38 2016 -0400
Add Keccak to vs2010.zip
commit 3962db73b7113ee805b46a5bb4da64e204fe6bb0
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 15:40:35 2016 -0400
Fold hmqv.cpp and fhmqv.cpp into mqv.cpp. There's no need for three empty source files
commit 44401448cbb6c8125b0f1ab4419c5b174408ffd7
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 15:39:23 2016 -0400
Fold hmqv.cpp and fhmqv.cpp into mqv.cpp. There's no need for three empty source files
commit 847bfccb8d5c388e67745dc8c69768fa503c5135
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 14:48:02 2016 -0400
Whitespace cleanup
commit 46a37be6fef361704dcf852bc9a099ce0a1da4c8
Merge: aefb8f8 3697867
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 14:43:01 2016 -0400
Merge 'master' into 'keccak'
commit aefb8f8ff2b81b967089c53b457a92fc6f7544d6
Merge: 51a828b 3c91d93
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 12:39:51 2016 -0400
Merge 'master' into 'keccak'
commit 51a828b88e37a4d18abb00300cd5522bd0e110c5
Merge: 4152870 e7c7722
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 10:41:36 2016 -0400
Merge 'master' into 'keccak'
commit 415287041e69ddadf5ca1f6fc794b87e145fc2db
Merge: 357a0c5 83ac849
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 10:34:45 2016 -0400
Merge 'master' into 'keccak'
commit 357a0c510f75e4e58078b500dd469462e90f7650
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 10:13:32 2016 -0400
Removed deprecated warning from SHA3 classes
commit 5cf9ec10d53b895b5a583e265e4e1298ed402195
Merge: 10ce0ed c2d60cc
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 09:43:15 2016 -0400
Merge 'master' into 'keccak'
commit 10ce0ed4c5b8a1ea230062fd2dfdec0d87ec5b42
Author: Jeffrey Walton <noloader@gmail.com>
Date: Thu Sep 8 09:37:40 2016 -0400
Add Keccak implementation based on early SHA3. Change SHA3 to NIST FIPS 202 conforming implementation
Diffstat (limited to 'mqv.cpp')
| -rw-r--r-- | mqv.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -1,7 +1,11 @@ // mqv.cpp - written and placed in the public domain by Wei Dai
+// HMQV provided by Jeffrey Walton, Ray Clayton and Uri Blumenthal.
+// FHMQV provided by Uri Blumenthal.
#include "pch.h"
#include "mqv.h"
+#include "hmqv.h"
+#include "fhmqv.h"
NAMESPACE_BEGIN(CryptoPP)
@@ -10,6 +14,16 @@ void TestInstantiations_MQV() {
MQV mqv;
}
+
+void TestInstantiations_HMQV()
+{
+ HMQV hmqv;
+}
+
+void TestInstantiations_FHMQV()
+{
+ FHMQV fhmqv;
+}
#endif
NAMESPACE_END
|