github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.AESStream: Improved package

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2187 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2010-03-06 14:40:52 +00:00
parent 90ad6d4d94
commit c8ee111650
4 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bazaar/AESStream/AESStream.cpp
View file

@ -1,4 +1,6 @@
#include <Core/Core.h>
#undef _WIN32
#include <openssl/rand.h>
#include "AESStream.h"
@ -58,10 +60,10 @@ void AESInit()
if (aesInitDone)
return;
aesInitDone = true;
if (RAND_status())
return;
qword qw = (((qword) GetTickCount()) << 16) ^ ((qword) (GetSysTime().Get())) ^ Random();
RAND_seed(&qw, sizeof(qw));
@ -283,4 +285,4 @@ String AESDecoderStream::GetDecryptedData() throw (const char *)
}
//----------------------------------------------------------------------------------------------
const dword AES_CONTAINER_DWORD_HEADER = 0x377FEA9F;
const dword AES_CONTAINER_DWORD_HEADER = 0x377FEA9F;

6
bazaar/AESStream/AESStream.upp
View file

@ -1,11 +1,11 @@
uses
Core;
library(MSC) out32\libeay32.lib;
library(MSC) "out32\\libeay32.lib gdi32.lib";
library(MSC WIN32) gdi32.lib;
library(WIN32 !MSC) out32dll\libeay32.lib;
library(WIN32 !MSC) out32dll/libeay32.lib;
library(!WIN32) ssl;
include
plugin\openssl\inc32;

11
bazaar/AESStream/plugin/openssl/inc32/openssl/rand.h
View file

@ -63,6 +63,17 @@
#include <openssl/ossl_typ.h>
#include <openssl/e_os2.h>
// Added to improve Upp supported systems detection
#ifdef PLATFORM_WIN32
#undef OPENSSL_SYS_UNIX
#define OPENSSL_SYS_WINDOWS
#define OPENSSL_SYS_WIN32
#else
#define OPENSSL_SYS_UNIX
#undef OPENSSL_SYS_WINDOWS
#undef OPENSSL_SYS_WIN32
#endif
#if defined(OPENSSL_SYS_WINDOWS)
#include <windows.h>
#endif

4
bazaar/AESStream/src.tpp/Installing_OpenSSL$en-us.tpp
View file

@ -24,7 +24,7 @@ topic "Installing OpenSSL";
[{_}%EN-US
[s2; Installing OpenSSL&]
[s5; [* 1. In Linux]&]
[s5; Just install libopenssl using your package manager.&]
[s5; Just install libssl using your package manager.&]
[s5;* &]
[s5; [* 2. In Windows]&]
[s5; These steps are valid for revision 0.9.8l. In other versions
@ -74,4 +74,4 @@ Files`\Microsoft Visual Studio 9.0`\VC`\vcvarsall.bat`"`" x86]&]
[s5; [* Last steps]&]
[s5; 2.6. Add in `"Setup/Build methods/Lib directories`" menu, the
directory where out32 and out32dll have been copied.&]
[s5; ]
[s0; ]