From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 9 Oct 2014 12:24:14 +0000 (+0000)
Subject: Regenerate SSH key.
X-Git-Tag: xonotic-v0.8.0~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ffcd4366cdb1e2ebb61e0e22adace036f849219;p=xonotic%2Fdarkplaces.git

Regenerate SSH key.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12099 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8989ca05d4347729e66a23acc86be4ade391bfb2
---

diff --git a/.travis-id_rsa-xonotic b/.travis-id_rsa-xonotic
index c8446b58..c23b6058 100644
Binary files a/.travis-id_rsa-xonotic and b/.travis-id_rsa-xonotic differ
diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index d2cdafbf..0be07620 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-set -ex
+set -e
+
+openssl aes-256-cbc -K $encrypted_eeb6f7a14a8e_key -iv $encrypted_eeb6f7a14a8e_iv -in .travis-id_rsa-xonotic -out id_rsa-xonotic -d
+
+set -x
 
-openssl aes-256-cbc \
-  -K $encrypted_08aaf016324d_key -iv $encrypted_08aaf016324d_iv \
-  -in .travis-id_rsa-xonotic -out id_rsa-xonotic -d
 chmod 0600 id_rsa-xonotic
-ssh-keygen -y -f id_rsa-xonotic
+# ssh-keygen -y -f id_rsa-xonotic
 
 rev=`git rev-parse HEAD`