diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index 8589000d74..733747a944 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -2129,8 +2129,6 @@ - - @@ -2151,10 +2149,6 @@ True True - - True - True - True True diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 58e9d67657..afae8a97f3 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -2856,9 +2856,6 @@ ripple\crypto - - ripple\crypto - ripple\crypto @@ -2880,9 +2877,6 @@ ripple\crypto\impl - - ripple\crypto\impl - ripple\crypto\impl diff --git a/src/ripple/crypto/DHUtil.h b/src/ripple/crypto/DHUtil.h deleted file mode 100644 index bf3e869749..0000000000 --- a/src/ripple/crypto/DHUtil.h +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_CRYPTO_DHUTIL_H_INCLUDED -#define RIPPLE_CRYPTO_DHUTIL_H_INCLUDED - -#include -#include - -namespace ripple { - -DH* DH_der_load (std::string const& strDer); -std::string DH_der_gen (int iKeyLength); - -} - -#endif diff --git a/src/ripple/crypto/impl/DHUtil.cpp b/src/ripple/crypto/impl/DHUtil.cpp deleted file mode 100644 index 7f71214e1c..0000000000 --- a/src/ripple/crypto/impl/DHUtil.cpp +++ /dev/null @@ -1,55 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include -#include - -namespace ripple { - -std::string DH_der_gen (int iKeyLength) -{ - DH* dh = 0; - int iCodes; - std::string strDer; - - do - { - dh = DH_generate_parameters (iKeyLength, DH_GENERATOR_5, nullptr, nullptr); - iCodes = 0; - DH_check (dh, &iCodes); - } - while (iCodes & (DH_CHECK_P_NOT_PRIME | DH_CHECK_P_NOT_SAFE_PRIME | DH_UNABLE_TO_CHECK_GENERATOR | DH_NOT_SUITABLE_GENERATOR)); - - strDer.resize (i2d_DHparams (dh, nullptr)); - - unsigned char* next = reinterpret_cast (&strDer[0]); - - (void) i2d_DHparams (dh, &next); - - return strDer; -} - -DH* DH_der_load (std::string const& strDer) -{ - const unsigned char* pbuf = reinterpret_cast (&strDer[0]); - - return d2i_DHparams (nullptr, &pbuf, strDer.size ()); -} - -} diff --git a/src/ripple/unity/crypto.cpp b/src/ripple/unity/crypto.cpp index 7791a83f5d..b99c49411a 100644 --- a/src/ripple/unity/crypto.cpp +++ b/src/ripple/unity/crypto.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include