commit ddd731eaa67e55a90b61172d00d9fb5cce1c54af
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jan 31 11:50:08 2014 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jan 31 11:50:08 2014 -0500
tree 011b1c3624dde7b18f6ea7703b2fc4da2dc31fa7
parent 64efcc913260882490aaa6e7c9773e3e74de60e4

Switch commoncpp2 to ucommon to solve dependency conflicts.

libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.

jni/libzrtp/sources/zrtp/ZrtpPacketDHPart.cpp

diff --git a/jni/libzrtp/sources/zrtp/ZrtpPacketDHPart.cpp b/jni/libzrtp/sources/zrtp/ZrtpPacketDHPart.cpp
index 1a89e16..8c59233 100644
--- a/jni/libzrtp/sources/zrtp/ZrtpPacketDHPart.cpp
+++ b/jni/libzrtp/sources/zrtp/ZrtpPacketDHPart.cpp
@@ -1,8 +1,8 @@
 /*
-  Copyright (C) 2006-2013 Werner Dittmann
+  Copyright (C) 2006-2007 Werner Dittmann
 
   This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
+  it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
@@ -59,12 +59,6 @@
     else if (*(int32_t*)pkt == *(int32_t*)ec38) {
         dhLength = 96;
     }
-    else if (*(int32_t*)pkt == *(int32_t*)e255) {
-        dhLength = 32;
-    }
-    else if (*(int32_t*)pkt == *(int32_t*)e414) {
-        dhLength = 104;
-    }
     else
         return;
 
@@ -80,24 +74,18 @@
 
     int16_t len = getLength();
     DEBUGOUT((fprintf(stdout, "DHPart length: %d\n", len)));
-    if (len == 85) {         // Dh2k
+    if (len == 85) {
         dhLength = 256;
     }
-    else if (len == 117) {   // Dh3k
+    else if (len == 117) {
         dhLength = 384;
     }
-    else if (len == 37) {    // EC256
+    else if (len == 37) {
         dhLength = 64;
     }
-    else if (len == 45) {    // EC384
+    else if (len == 45) {
         dhLength = 96;
     }
-    else if (len == 29) {    // E255
-        dhLength = 32;
-    }
-    else if (len == 47) {    // E414
-        dhLength = 104;
-    }
     else {
         pv = NULL;
         return;