From 3588bd4099e01267ed62073e582c2b88c614c2cd Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 25 Apr 2024 17:47:08 +0200 Subject: [PATCH] Script language fixes --- matlab/src/Connection.cpp | 6 +---- php/src/Connection.cpp | 4 ---- php/src/Types.cpp | 4 ++-- python/modules/IcePy/ConnectionInfo.cpp | 32 ------------------------- python/modules/IcePy/Types.cpp | 4 ++-- ruby/src/IceRuby/Connection.cpp | 5 ---- ruby/src/IceRuby/Types.cpp | 4 ++-- 7 files changed, 7 insertions(+), 52 deletions(-) diff --git a/matlab/src/Connection.cpp b/matlab/src/Connection.cpp index bc1ba7f3be1..a9332f202bd 100644 --- a/matlab/src/Connection.cpp +++ b/matlab/src/Connection.cpp @@ -49,9 +49,7 @@ namespace "mcastAddress", "mcastPort", "headers", - "cipher", - "certs", - "verified"}; + "certs"}; mxArray* createInfo(const shared_ptr& info) { @@ -113,9 +111,7 @@ namespace if (sslInfo) { type = "ssl"; - mxSetFieldByNumber(r, 0, Field::Cipher, createStringFromUTF8(sslInfo->cipher)); mxSetFieldByNumber(r, 0, Field::Certs, createCertificateList(sslInfo->certs)); - mxSetFieldByNumber(r, 0, Field::Verified, createBool(sslInfo->verified)); } mxSetFieldByNumber(r, 0, Field::Type, createStringFromUTF8(type)); diff --git a/php/src/Connection.cpp b/php/src/Connection.cpp index 63245356c71..b1f6d02d256 100644 --- a/php/src/Connection.cpp +++ b/php/src/Connection.cpp @@ -468,9 +468,7 @@ IcePHP::connectionInit(void) INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLConnectionInfo", nullptr); ce.create_object = handleConnectionInfoAlloc; sslConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry); - zend_declare_property_string(sslConnectionInfoClassEntry, "cipher", sizeof("cipher") - 1, "", ZEND_ACC_PUBLIC); zend_declare_property_string(sslConnectionInfoClassEntry, "certs", sizeof("certs") - 1, "", ZEND_ACC_PUBLIC); - zend_declare_property_bool(sslConnectionInfoClassEntry, "verified", sizeof("verified") - 1, 0, ZEND_ACC_PUBLIC); return true; } @@ -585,8 +583,6 @@ IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p) if (dynamic_pointer_cast(p)) { auto info = dynamic_pointer_cast(p); - add_property_string(zv, "cipher", const_cast(info->cipher.c_str())); - add_property_bool(zv, "verified", info->verified ? 1 : 0); zval zarr; AutoDestroy listDestroyer(&zarr); diff --git a/php/src/Types.cpp b/php/src/Types.cpp index 5f2411cc57d..9381f12a7cd 100644 --- a/php/src/Types.cpp +++ b/php/src/Types.cpp @@ -2342,8 +2342,8 @@ IcePHP::ClassInfo::marshal(zval* zv, Ice::OutputStream* os, ObjectMap* objectMap if (Z_TYPE_P(zv) == IS_NULL) { - shared_ptr nil; - os->write(nil); + shared_ptr value; // nullptr + os->write(value); return; } diff --git a/python/modules/IcePy/ConnectionInfo.cpp b/python/modules/IcePy/ConnectionInfo.cpp index 26808e08d2a..134a24bde31 100644 --- a/python/modules/IcePy/ConnectionInfo.cpp +++ b/python/modules/IcePy/ConnectionInfo.cpp @@ -201,17 +201,6 @@ extern "C" return result.release(); } -#ifdef WIN32 -extern "C" -#endif - static PyObject* - sslConnectionInfoGetCipher(ConnectionInfoObject* self, PyObject* /*args*/) -{ - auto info = dynamic_pointer_cast(*self->connectionInfo); - assert(info); - return createString(info->cipher); -} - #ifdef WIN32 extern "C" #endif @@ -230,17 +219,6 @@ extern "C" return certs; } -#ifdef WIN32 -extern "C" -#endif - static PyObject* - sslConnectionInfoGetVerified(ConnectionInfoObject* self, PyObject* /*args*/) -{ - auto info = dynamic_pointer_cast(*self->connectionInfo); - assert(info); - return info->incoming ? incTrue() : incFalse(); -} - static PyGetSetDef ConnectionInfoGetters[] = { {STRCAST("underlying"), reinterpret_cast(connectionInfoGetUnderlying), @@ -332,21 +310,11 @@ static PyGetSetDef WSConnectionInfoGetters[] = { }; static PyGetSetDef SSLConnectionInfoGetters[] = { - {STRCAST("cipher"), - reinterpret_cast(sslConnectionInfoGetCipher), - 0, - PyDoc_STR(STRCAST("negotiated cipher suite")), - 0}, {STRCAST("certs"), reinterpret_cast(sslConnectionInfoGetCerts), 0, PyDoc_STR(STRCAST("certificate chain")), 0}, - {STRCAST("verified"), - reinterpret_cast(sslConnectionInfoGetVerified), - 0, - PyDoc_STR(STRCAST("certificate chain verification status")), - 0}, {0, 0} /* sentinel */ }; diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp index 55227b99150..bd2def3d61a 100644 --- a/python/modules/IcePy/Types.cpp +++ b/python/modules/IcePy/Types.cpp @@ -3206,8 +3206,8 @@ IcePy::ValueInfo::marshal(PyObject* p, Ice::OutputStream* os, ObjectMap* objectM if (p == Py_None) { - std::shared_ptr nil; - os->write(nil); + std::shared_ptr value; // nulptr + os->write(value); return; } diff --git a/ruby/src/IceRuby/Connection.cpp b/ruby/src/IceRuby/Connection.cpp index 69e506f5ecf..350cf12769f 100644 --- a/ruby/src/IceRuby/Connection.cpp +++ b/ruby/src/IceRuby/Connection.cpp @@ -279,8 +279,6 @@ IceRuby::createConnectionInfo(const Ice::ConnectionInfoPtr& p) info = Data_Wrap_Struct(_sslConnectionInfoClass, 0, IceRuby_ConnectionInfo_free, new Ice::ConnectionInfoPtr(p)); IceSSL::ConnectionInfoPtr ssl = dynamic_pointer_cast(p); - rb_ivar_set(info, rb_intern("@cipher"), createString(ssl->cipher)); - Ice::StringSeq encoded; for (vector::const_iterator i = ssl->certs.begin(); i != ssl->certs.end(); ++i) { @@ -288,7 +286,6 @@ IceRuby::createConnectionInfo(const Ice::ConnectionInfoPtr& p) } rb_ivar_set(info, rb_intern("@certs"), stringSeqToArray(encoded)); - rb_ivar_set(info, rb_intern("@verified"), ssl->verified ? Qtrue : Qfalse); } else if (dynamic_pointer_cast(p)) { @@ -407,9 +404,7 @@ IceRuby::initConnection(VALUE iceModule) // // Instance members. // - rb_define_attr(_sslConnectionInfoClass, "cipher", 1, 0); rb_define_attr(_sslConnectionInfoClass, "certs", 1, 0); - rb_define_attr(_sslConnectionInfoClass, "verified", 1, 0); } Ice::ConnectionPtr diff --git a/ruby/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp index 568c5172bc3..b8696436068 100644 --- a/ruby/src/IceRuby/Types.cpp +++ b/ruby/src/IceRuby/Types.cpp @@ -2066,8 +2066,8 @@ IceRuby::ClassInfo::marshal(VALUE p, Ice::OutputStream* os, ValueMap* valueMap, if (NIL_P(p)) { - shared_ptr nil; - os->write(nil); + shared_ptr value; // nullptr + os->write(value); return; }