X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Futil%2FEncoder.cpp;h=8daa6665c1fe5fe53ba1289a7a076a1e02ec6d16;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=6162a07e6b1e78c423017dceed6c7e5738f08c9e;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/core/util/Encoder.cpp b/source/core/util/Encoder.cpp index 6162a07..8daa666 100644 --- a/source/core/util/Encoder.cpp +++ b/source/core/util/Encoder.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -45,12 +17,12 @@ using namespace std; using namespace anna; void Encoder::initialize() -throw() { +{ srand(functions::second()); } const EncodedData& Encoder::encode(const DataBlock& data) -throw(RuntimeException) { +noexcept(false) { DES_cblock key [3]; DES_key_schedule* skey [3]; @@ -86,7 +58,7 @@ throw(RuntimeException) { // (1) Elimina los 8 primeros bytes que tuvimos que poner de relleno en la codificacion. //------------------------------------------------------------------------------------------------- const DataBlock& Encoder::decode(const EncodedData& data) -throw(RuntimeException) { +noexcept(false) { if(data.a_realSize <= 0) { string msg("anna::Encoder::encode | Cannot decode an uninitialized data"); throw RuntimeException(msg, ANNA_FILE_LOCATION); @@ -121,7 +93,7 @@ throw(RuntimeException) { // 'const_cast (data).a_value.remove (sizeof (DES_cblock));' //------------------------------------------------------------------------------------------------- DataBlock& Encoder::setDataBlock(const DataBlock& other) -throw(RuntimeException) { +noexcept(false) { DataBlock& value = a_data.a_value; int r; value.clear();