SSLIOP_Vault.cpp

1 files changed, 52 insertions, 3 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index 410b433a8de..700ae0121b9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -23,11 +23,16 @@
 
 #include "SSLIOP_X509.h"
 
+#ifndef NO_RSA
+# include "SSLIOP_RSA.h"
+#endif  /* !NO_RSA */
+
+// #ifndef NO_DSA
+// # include "SSLIOP_DSA.h"
+// #endif  /* !NO_DSA */
+
 #include "orbsvcs/SecurityLevel2C.h"
 
-/// Forward declarations.
-struct x509_st;
-typedef x509_st X509;
 
 class TAO_SSLIOP_Credentials;
 typedef TAO_SSLIOP_Credentials* TAO_SSLIOP_Credentials_ptr;
@@ -108,6 +113,16 @@ public:
   /// Constructor
   TAO_SSLIOP_Credentials (X509 *cert);
 
+#ifndef NO_RSA
+  /// Constructor
+  TAO_SSLIOP_Credentials (X509 *cert, RSA *rsa);
+#endif  /* !NO_RSA */
+
+// #ifndef NO_DSA
+//   /// Constructor
+//   TAO_SSLIOP_Credentials (X509 *cert, DSA *dsa);
+// #endif  /* !NO_DSA */
+
   /// Return a duplicate (specifically a deep copy) of this credential
   /// object.
   virtual SecurityLevel2::Credentials_ptr copy (
@@ -219,6 +234,32 @@ public:
   X509 *x509 (void);
   //@}
 
+#ifndef NO_RSA
+  //@{
+  /// Return a pointer to the underlying RSA key.
+  /**
+   * @return Non-zero value if RSA key is used.
+   *
+   * @note Caller owns the returned object.  Use a
+   *       TAO_SSLIOP_RSA_var.
+   */
+  RSA *rsa (void);
+  //@}
+#endif  /* !NO_RSA */
+
+// #ifndef NO_DSA
+//   //@{
+//   /// Return a pointer to the underlying DSA key.
+//   /**
+//    * @return Non-zero value if DSA key is used.
+//    *
+//    * @note Caller owns the returned object.  Use a
+//    *       TAO_SSLIOP_DSA_var.
+//    */
+//   DSA *dsa (void);
+//   //@}
+// #endif  /* !NO_DSA */
+
   //@{
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
   typedef TAO_SSLIOP_Credentials_ptr _ptr_type;
@@ -292,6 +333,14 @@ protected:
   /// Credentials object.
   TAO_SSLIOP_X509_var x509_;
 
+#ifndef NO_RSA
+  TAO_SSLIOP_RSA_var rsa_;
+#endif  /* !NO_RSA */
+
+// #ifndef NO_DSA
+//   TAO_SSLIOP_DSA_var dsa_;
+// #endif  /* !NO_DSA */
+
 };
 
 #if defined (__ACE_INLINE__)