Commit 7bddd524 authored by unknown's avatar unknown
Browse files

Fix merge error 


extra/yassl/src/yassl_int.cpp:
  Fix merge error, missing {
extra/yassl/taocrypt/src/integer.cpp:
  Fix merge error, duplicate function definition
parent 8d1230c6

extra/yassl/src/yassl_int.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ Sessions& GetSessions() 


static sslFactory* sslFactoryInstance = 0;



sslFactory& GetSSL_Factory()

sslFactory& GetSSL_Factory(){

    if (!sslFactoryInstance)

        sslFactoryInstance = NEW_YS sslFactory;

    return *sslFactoryInstance;

extra/yassl/taocrypt/src/integer.cpp

+0 −8
Original line number Diff line number Diff line
@@ -2738,14 +2738,6 @@ void CleanUp() 
}





// Clean up static singleton holders, not a leak, but helpful to have gone

// when checking for leaks

void CleanUp()

{

    tcDelete(one);

    tcDelete(zero);

}



Integer::Integer(RandomNumberGenerator& rng, const Integer& min,

                 const Integer& max)

{