Merge pull request #1679 from jwillemsen/jwi-ssl3

Layout/override changes

8 files changed, 9 insertions, 27 deletions

diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
index fb616747524..704a96b0745 100755
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 
-openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
     -out server-cert.pem -keyout server-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
 
 cat server-cert.pem >>server-key.pem
 cat server-cert.pem >ca.pem
 
-openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
     -out client-cert.pem -keyout client-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
 
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/README b/TAO/orbsvcs/tests/Security/Big_Request/README
index f652063600a..3bf8f03136e 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/README
+++ b/TAO/orbsvcs/tests/Security/Big_Request/README
@@ -1,5 +1,3 @@
-
-
 ---
 The initial version of this test was contributed by Andrew Finnell.
 Additional modifications (simplifications, improvements, etc) were
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl
index 7922a8f818d..e48e4bb37a1 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl
@@ -17,10 +17,8 @@ typedef CORBA::OctetSeq DataSeq;
 
 interface TX_Object
 {
-
   void send (in DataSeq data);
   void recv (out DataSeq data);
 
   oneway void shutdown ();
-
 };
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index 3093f44df94..6e17de0d98e 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -7,10 +7,6 @@ TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb)
 {
 }
 
-TX_Object_i::~TX_Object_i (void)
-{
-}
-
 void
 TX_Object_i::send (const DataSeq & data)
 {
@@ -36,7 +32,7 @@ TX_Object_i::recv (DataSeq_out data)
 }
 
 void
-TX_Object_i::shutdown (void)
+TX_Object_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index 932507faa40..a4fbe6a2637 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -20,30 +20,25 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 class  TX_Object_i : public virtual POA_TX_Object
 {
 public:
-
   // Constructor
   TX_Object_i (CORBA::ORB_ptr orb);
 
   // Destructor
-  virtual ~TX_Object_i (void);
+  ~TX_Object_i () override = default;
 
   virtual void send (const DataSeq & data);
 
   virtual void recv (DataSeq_out data);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
 private:
-
   CORBA::ORB_var orb_;
 
   DataSeq data_;
-
 };
 
-
 #endif  /* TX_OBJECT_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/README b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/README
index be733600765..66cef8367df 100644
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/README
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/README
@@ -1,8 +1,5 @@
-
-
 This is a regression test to demonstrate a problem in collocated invocation with SSLIOP in a separate thread.
 
-
 How to Run:
 
 1) Automatially:
@@ -14,12 +11,10 @@ To start the server:
 ------------------
 ./MessengerServer -ORBSvcConf server.conf
 
-
 To start the client:
 ------------------
 ./MessengerClient -ORBSvcConf client.conf
 
-
 Output:
 NO_PERMISSION exception is thrown.
 
diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys
index fb616747524..704a96b0745 100755
--- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys
+++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/ssl/make-client-keys
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 
-openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
     -out server-cert.pem -keyout server-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
 
 cat server-cert.pem >>server-key.pem
 cat server-cert.pem >ca.pem
 
-openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
     -out client-cert.pem -keyout client-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
 
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
index fb616747524..704a96b0745 100755
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 
-openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
     -out server-cert.pem -keyout server-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
 
 cat server-cert.pem >>server-key.pem
 cat server-cert.pem >ca.pem
 
-openssl req -new -x509 -days 3650 -nodes -newkey rsa:1024 \
+openssl req -new -x509 -days 9999 -nodes -newkey rsa:1024 \
     -out client-cert.pem -keyout client-key.pem \
     -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"