-
Notifications
You must be signed in to change notification settings - Fork 592
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move C++ ssl transport to Ice core #2044
Conversation
cpp/include/IceSSL/IceSSL.h
Outdated
@@ -5,9 +5,6 @@ | |||
#ifndef ICESSL_ICESSL_H | |||
#define ICESSL_ICESSL_H | |||
|
|||
#include "Config.h" | |||
#include "Plugin.h" | |||
|
|||
#if defined(_WIN32) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume we want to remove the IceSSL include directory entirely once the merger is complete?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the remaining public headers:
Certificate.h
ConnectionInfo.h
ConnectionInfoF.h
EndpointInfo.h
OpenSSL.h
SChannel.h
SecureTransport.h
cpp/include/IceSSL/OpenSSL.h
Outdated
@@ -59,7 +21,7 @@ namespace IceSSL | |||
* Encapsulates an OpenSSL X.509 certificate. | |||
* \headerfile IceSSL/IceSSL.h | |||
*/ | |||
class ICESSL_OPENSSL_API Certificate : public virtual IceSSL::Certificate | |||
class ICE_API Certificate : public virtual IceSSL::Certificate |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we remove the virtual, or do we actually use multiple inheritance with Certificates?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I think we can. We should first consider if we want to keep them.
The main use case I see now for this class is to inspect the peer certificate in the connection info.
- Remove the random usage in the tests - Adds a test to exercise Ice.ServerIdleTime - Fix a few selector bugs Closes zeroc-ice#2025
No description provided.