Update server readme.txt

[xonotic/xonotic.git] / misc / infrastructure / keygen / response.d0ir

diff --git a/misc/infrastructure/keygen/response.d0ir b/misc/infrastructure/keygen/response.d0ir
index 29fd5d4298c753ed245b6806674b7481f9d571cd..a74fb37a746fd92681c3f34c990eb0bf4cba4800 100755 (executable)
--- a/misc/infrastructure/keygen/response.d0ir
+++ b/misc/infrastructure/keygen/response.d0ir
@@ -1,5 +1,14 @@
 #!/usr/bin/perl
 
+BEGIN
+{
+        $ENV{PATH} = "/usr/bin:/bin";
+}
+
+# if we are suid, set uid := euid
+$( = $);
+$< = $>;
+
 use strict;
 use CGI;
 use LWP::Simple;
@@ -125,7 +134,7 @@ sub check_banlist($)
 our %ca = ();
 our $default_ca = 0;
 
-do 'config.pl';
+do './config.pl';
 
 if((my $key = $cgi->param('key')))
 {
@@ -158,11 +167,11 @@ if((my $key = $cgi->param('key')))
                $ENV{REQUESTFILE} = $tempfh->filename;
                $ENV{RESPONSEFILE} = $tempfh->filename;
                $ENV{SECRET} = "key_$ca.d0sk";
-               open my $errfh, '-|', './xonotic-keygen -P "$SECRET" -j "$REQUESTFILE" -o "$RESPONSEFILE" 2>&1'
-                       or die "cannot start xonotic-keygen";
+               open my $errfh, '-|', './crypto-keygen-standalone -P "$SECRET" -j "$REQUESTFILE" -o "$RESPONSEFILE" 2>&1'
+                       or die "cannot start crypto-keygen-standalone";
                my $err = <$errfh>;
                close $errfh
-                       or die "xonotic-keygen failed: $err";
+                       or die "crypto-keygen-standalone failed: $err";
                1;
        }
        or do
@@ -190,15 +199,15 @@ Content-type: text/html
        <form action="response.d0ir" method="post" enctype="multipart/form-data">
        To generate and sign a key IN GAME, follow these steps on the console:
        <ol>
-               <li>crypto_keygen $default_ca http://rm.endoftheinternet.org/~xonotic/keygen/?ca=$default_ca&amp;key=</li>
+               <li>crypto_keygen $default_ca http://ca.xonotic.org/?ca=$default_ca&amp;key=</li>
        </ol>
        To generate and sign a key MANUALLY, follow these steps on a UNIX command line:
        <ol>
-               <li>./xonotic-keygen -p key_$default_ca.d0pk -o key_$default_ca.d0si</li>
-               <li>./xonotic-keygen -p key_$default_ca.d0pk -I key_$default_ca.d0si -o request.d0iq -O camouflage.d0ic
+               <li>./crypto-keygen-standalone -p key_$default_ca.d0pk -o key_$default_ca.d0si</li>
+               <li>./crypto-keygen-standalone -p key_$default_ca.d0pk -I key_$default_ca.d0si -o request.d0iq -O camouflage.d0ic
                <li>Upload the request.d0iq file: <input type="file" name="key"><input type="submit"></li>
                <li>Save the response.d0ir file you are getting</li>
-               <li>./xonotic-keygen -p key_$default_ca.d0pk -I key_$default_ca.d0si -c camouflage.d0ic -J response.d0ir -o key_$default_ca.d0si</li>
+               <li>./crypto-keygen-standalone -p key_$default_ca.d0pk -I key_$default_ca.d0si -c camouflage.d0ic -J response.d0ir -o key_$default_ca.d0si</li>
                <li>Delete request.d0iq, camouflage.d0ic, response.d0ir</li>
        </ol>
        Your key_$default_ca.d0si key is now signed.