Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/synergy/patches/synergy-1.4.15-use-system-cryptopp.patch

    Annotation of /trunk/synergy/patches/synergy-1.4.15-use-system-cryptopp.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2391 - (hide annotations) (download)
    Tue Jan 28 11:50:39 2014 UTC (10 years, 4 months ago) by niro
    File size: 2593 byte(s) 
    -added synergy files
    1 niro 2391 --- a/CMakeLists.txt
    2     +++ b/CMakeLists.txt
    3     @@ -133,6 +133,10 @@
    4     check_type_size(long SIZEOF_LONG)
    5     check_type_size(short SIZEOF_SHORT)
    6    
    7     + set(CMAKE_REQUIRED_LIBRARIES crypto++)
    8     + set(CMAKE_REQUIRED_LIBRARIES)
    9     + set(CMAKE_INCLUDE_DIRECTORIES)
    10     +
    11     # pthread is used on both Linux and Mac
    12     check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
    13     if (HAVE_PTHREAD)
    14     --- a/tools/CMakeLists.txt
    15     +++ b/tools/CMakeLists.txt
    16     @@ -13,47 +13,6 @@
    17     # You should have received a copy of the GNU General Public License
    18     # along with this program. If not, see <http://www.gnu/licenses/>.
    19    
    20     -set(cryptopp_dir cryptopp562)
    21     -
    22     -# only compile the crypto++ files we need.
    23     -set(cryptopp_src
    24     - ${cryptopp_dir}/3way.cpp
    25     - ${cryptopp_dir}/algparam.cpp
    26     - ${cryptopp_dir}/asn.cpp
    27     - ${cryptopp_dir}/authenc.cpp
    28     - ${cryptopp_dir}/basecode.cpp
    29     - ${cryptopp_dir}/cpu.cpp
    30     - ${cryptopp_dir}/cryptlib.cpp
    31     - ${cryptopp_dir}/des.cpp
    32     - ${cryptopp_dir}/dessp.cpp
    33     - ${cryptopp_dir}/dll.cpp
    34     - ${cryptopp_dir}/ec2n.cpp
    35     - ${cryptopp_dir}/ecp.cpp
    36     - ${cryptopp_dir}/filters.cpp
    37     - ${cryptopp_dir}/fips140.cpp
    38     - ${cryptopp_dir}/gcm.cpp
    39     - ${cryptopp_dir}/gf2n.cpp
    40     - ${cryptopp_dir}/gfpcrypt.cpp
    41     - ${cryptopp_dir}/hex.cpp
    42     - ${cryptopp_dir}/hmac.cpp
    43     - ${cryptopp_dir}/hrtimer.cpp
    44     - ${cryptopp_dir}/integer.cpp
    45     - ${cryptopp_dir}/iterhash.cpp
    46     - ${cryptopp_dir}/misc.cpp
    47     - ${cryptopp_dir}/modes.cpp
    48     - ${cryptopp_dir}/mqueue.cpp
    49     - ${cryptopp_dir}/nbtheory.cpp
    50     - ${cryptopp_dir}/oaep.cpp
    51     - ${cryptopp_dir}/osrng.cpp
    52     - ${cryptopp_dir}/pubkey.cpp
    53     - ${cryptopp_dir}/queue.cpp
    54     - ${cryptopp_dir}/randpool.cpp
    55     - ${cryptopp_dir}/rdtables.cpp
    56     - ${cryptopp_dir}/rijndael.cpp
    57     - ${cryptopp_dir}/rng.cpp
    58     - ${cryptopp_dir}/sha.cpp
    59     -)
    60     -
    61     # if 64-bit windows, compile asm file.
    62     if (CMAKE_CL_64)
    63     list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm)
    64     @@ -83,5 +42,3 @@
    65     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
    66     endif()
    67     endif()
    68     -
    69     -add_library(cryptopp STATIC ${cryptopp_src})
    70     --- a/src/lib/io/CCryptoMode.h
    71     +++ b/src/lib/io/CCryptoMode.h
    72     @@ -17,9 +17,9 @@
    73    
    74     #pragma once
    75    
    76     -#include <cryptopp562/gcm.h>
    77     -#include <cryptopp562/modes.h>
    78     -#include <cryptopp562/aes.h>
    79     +#include <cryptopp/gcm.h>
    80     +#include <cryptopp/modes.h>
    81     +#include <cryptopp/aes.h>
    82     #include "ECryptoMode.h"
    83     #include "CString.h"
    84    
    85     --- a/src/lib/io/CCryptoStream.h
    86     +++ b/src/lib/io/CCryptoStream.h
    87     @@ -20,8 +20,8 @@
    88     #include "BasicTypes.h"
    89     #include "CStreamFilter.h"
    90     #include "CCryptoMode.h"
    91     -#include <cryptopp562/osrng.h>
    92     -#include <cryptopp562/sha.h>
    93     +#include <cryptopp/osrng.h>
    94     +#include <cryptopp/sha.h>
    95    
    96     class CCryptoOptions;
    97