Skip to content
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

Closed
wants to merge 31 commits into from
Closed

Conversation

pepone
Copy link
Member

@pepone pepone commented Apr 11, 2024

No description provided.

@pepone pepone marked this pull request as draft April 11, 2024 17:31
config/Make.rules.Linux Outdated Show resolved Hide resolved
@@ -5,9 +5,6 @@
#ifndef ICESSL_ICESSL_H
#define ICESSL_ICESSL_H

#include "Config.h"
#include "Plugin.h"

#if defined(_WIN32)
Copy link
Member

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?

Copy link
Member Author

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 Show resolved Hide resolved
@@ -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
Copy link
Member

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?

Copy link
Member Author

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.

cpp/src/Ice/Instance.h Outdated Show resolved Hide resolved
cpp/src/Ice/Instance.cpp Outdated Show resolved Hide resolved
cpp/src/Ice/Instance.cpp Outdated Show resolved Hide resolved
cpp/src/IceSSL/SSLAcceptorI.cpp Show resolved Hide resolved
@bernardnormier bernardnormier self-requested a review April 11, 2024 21:17
@pepone pepone closed this Apr 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants