From be24ac6b235a00537fc3c113c07ef1fbf05a843d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 2 May 2008 19:38:44 +0000
Subject: [PATCH] -Move to single file for certificate and key for simplicity

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1256 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT-2.0/xCAT/Client.pm | 4 ++--
 xCAT-server-2.0/sbin/xcatd   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/perl-xCAT-2.0/xCAT/Client.pm b/perl-xCAT-2.0/xCAT/Client.pm
index 66f79b07d..51c8e2830 100644
--- a/perl-xCAT-2.0/xCAT/Client.pm
+++ b/perl-xCAT-2.0/xCAT/Client.pm
@@ -72,8 +72,8 @@ sub submit_request {
   my $keyfile = shift;
   my $certfile = shift;
   my $cafile = shift;
-  unless ($keyfile) { $keyfile = $ENV{HOME}."/.xcat/client-key.pem"; }
-  unless ($certfile) { $certfile = $ENV{HOME}."/.xcat/client-cert.pem"; }
+  unless ($keyfile) { $keyfile = $ENV{HOME}."/.xcat/client-cred.pem"; }
+  unless ($certfile) { $certfile = $ENV{HOME}."/.xcat/client-cred.pem"; }
   unless ($cafile) { $cafile  = $ENV{HOME}."/.xcat/ca.pem"; }
   $xCAT::Client::EXITCODE = 0;    # clear out exit code before invoking the plugin
 
diff --git a/xCAT-server-2.0/sbin/xcatd b/xCAT-server-2.0/sbin/xcatd
index 1d1675d6f..b76e03490 100755
--- a/xCAT-server-2.0/sbin/xcatd
+++ b/xCAT-server-2.0/sbin/xcatd
@@ -479,8 +479,8 @@ until ($quit) {
     eval {
       alarm(10);
       $connection = IO::Socket::SSL->start_SSL($cnnection,
-      SSL_key_file=>$xcatdir."/cert/server-key.pem",
-      SSL_cert_file=>$xcatdir."/cert/server-cert.pem",
+      SSL_key_file=>$xcatdir."/cert/server-cred.pem",
+      SSL_cert_file=>$xcatdir."/cert/server-cred.pem",
       SSL_ca_file=>$xcatdir."/cert/ca.pem",
       SSL_server=>1,
       SSL_verify_mode=> 1