Update of /cvsroot/netrek/client/netrekxp In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16034 Modified Files: build.cmd clientr.vcproj compile.txt Removed Files: rsa.txt Log Message: Remove RSA code from source and makefiles,as it is deprecated. Keep reference in socket code to SP_RSA_KEY and CP_RSA_KEY as these values are fixed server side. Refer to RSA as deprecated in documentation. Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- compile.txt 6 Apr 2008 23:29:54 -0000 1.15 +++ compile.txt 9 May 2009 21:21:41 -0000 1.16 @@ -11,15 +11,10 @@ -------- Edit build.cmd to set following variables: -RSAKey = path to your RSA-KEY.secret file Compiler = VCC or BCC (default VCC) InstCWD = path to folder to copy files to (default \netrek_files) HelpCompiler = path to hhc.exe from Microsoft's HTML Help Workshop (available from microsoft.com) -Step 1a: --------- -Generate your rsa_box files, see rsa.txt for instructions. - Step 2: -------- --- rsa.txt DELETED --- Index: clientr.vcproj =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.vcproj,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- clientr.vcproj 7 Jun 2007 04:43:36 -0000 1.13 +++ clientr.vcproj 9 May 2009 21:21:41 -0000 1.14 @@ -47,7 +47,7 @@ Optimization="0" WholeProgramOptimization="false" AdditionalIncludeDirectories="win32;win32\h;win32\SDL;include" - PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;RSA;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;_CONSOLE" MinimalRebuild="false" RuntimeLibrary="1" PrecompiledHeaderFile="\netrek_files\tmp\src\Debug/clientr.pch" @@ -1180,144 +1180,6 @@ </FileConfiguration> </File> <File - RelativePath="src\rsa_box.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - CompileAs="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="src\rsa_box_0.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - CompileAs="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="src\rsa_box_1.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - CompileAs="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="src\rsa_box_2.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - CompileAs="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="src\rsa_box_3.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - CompileAs="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="src\rsa_box_4.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - CompileAs="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File RelativePath="src\senddist.c" > <FileConfiguration Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- build.cmd 16 Jun 2008 00:05:44 -0000 1.33 +++ build.cmd 9 May 2009 21:21:41 -0000 1.34 @@ -1,4 +1,3 @@ -set RSAKey="\netrek_files\rsa\NetrekXP-2009-RSA-Key-Win32.secret" set InstCWD="\netrek_files" set HelpCompiler="C:\Program Files\HTML Help Workshop\hhc.exe" rem set Compiler=VCC @@ -8,7 +7,6 @@ @echo off Set MyCWD=%cd% if /I "%1" == "clean" goto :clean -if /I "%1" == "cleanrsa" goto :cleanrsa if /I "%1" == "dist" goto :dist if /I "%1" == "build" goto :build if /I "%1" == "pics" goto :pics @@ -363,10 +361,6 @@ popd popd -pushd src -%MyCWD%\tools\mkkey -k %RSAKEY% -popd - if /I "%Compiler%" == "BCC" goto :CompilerBCC if /I "%Compiler%" == "VCC" goto :CompilerVCC if /I "%Compiler%" == "CYGWIN" goto :CompilerCYGWIN @@ -632,11 +626,4 @@ goto :end -:cleanrsa -pushd src -del rsa*.c -popd - -goto :end - :end