* #40116: Add zrtp related files, update libzrtpcpp
diff --git a/jni/libzrtp/sources/zrtp/libzrtpcpp/ZrtpConfigure.h b/jni/libzrtp/sources/zrtp/libzrtpcpp/ZrtpConfigure.h
index 896a85f..bb78cef 100644
--- a/jni/libzrtp/sources/zrtp/libzrtpcpp/ZrtpConfigure.h
+++ b/jni/libzrtp/sources/zrtp/libzrtpcpp/ZrtpConfigure.h
@@ -1,8 +1,8 @@
/*
- Copyright (C) 2009 - 2010 Werner Dittmann
+ Copyright (C) 2009 - 2013 Werner Dittmann
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
+ it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
@@ -315,6 +315,14 @@
~ZrtpConfigure();
/**
+ * Define the algorithm selection policies.
+ */
+ typedef enum _policies {
+ Standard = 1,
+ PreferNonNist = 2
+ } Policy;
+
+ /**
* Set the maximum number of algorithms per algorithm type that an application can
* configure.
*/
@@ -510,6 +518,9 @@
/// Helper function to print some internal data
void printConfiguredAlgos(AlgoTypes algoTyp);
+ Policy getSelectionPolicy() {return selectionPolicy;}
+ void setSelectionPolicy(Policy pol) {selectionPolicy = pol;}
+
private:
std::vector<AlgorithmEnum* > hashes;
std::vector<AlgorithmEnum* > symCiphers;
@@ -532,6 +543,8 @@
void printConfiguredAlgos(std::vector<AlgorithmEnum* >& a);
+ Policy selectionPolicy;
+
protected:
public: