Version 0.8.5. Deprecate built-in ros2 module. Fix security dependenc…

…y versions.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustdds"
-version = "0.8.4"
+version = "0.8.5"
 authors = ["Juhana Helovuo <[email protected]>", 
   "Oiva Moisio <[email protected]>", 
   "Miska Melkinen <[email protected]>", 
@@ -64,14 +64,14 @@ serde-xml-rs = { version = "0.6" , optional = true } # for reading spec-mandated
 glob = { version = "0.3" , optional = true } # for reading spec-mandated XML config files
 mailparse = { version = "0.14" , optional = true } # for reading S/MIME-encoded (XML) config files
 x509-certificate = { version = "0.21" , optional = true } # for configuration certificates
-x509-cert = { version = "*" , optional = true }
+x509-cert = { version = "0.2" , optional = true }
 tempfile = { version = "3" , optional = true } # for calling external openssl command. Remove when no longer used.
 newline-converter = { version = "0.3" , optional = true } # helper for handling S/MIME
-ring = { version = "*" , optional = true } # Cryptographic primitives
-cms = { version = "*" , optional = true } # for ASN.1 parsing
-der = { version = "*" , optional = true } # ASN.1 DER encoding
-bcder = { version = "*" , optional = true } # ASN.1 DER encoding
-const-oid = { version = "*" , optional = true } # more ASN.1
+ring = { version = "0.16" , optional = true } # Cryptographic primitives
+cms = { version = "0.2" , optional = true } # for ASN.1 parsing
+der = { version = "0.7" , optional = true } # ASN.1 DER encoding
+bcder = { version = "0.7" , optional = true } # ASN.1 DER encoding
+const-oid = { version = "0.9" , optional = true } # more ASN.1
 
 [target.'cfg(windows)'.dependencies]
 local-ip-address = "0.5.3"

README.md

@@ -18,6 +18,13 @@ Currently, the implementation is complete enough to do data exchange with [ROS2]
 
 The [ros2-client](https://crates.io/crates/ros2-client) is recommended for talking to ROS components. The `ros2` module within RustDDS should not be used anymore.
 
+## Version 0.8.5
+
+* Feature `security` merged to master, but it is still work-in-progress, so does not work yet.
+* Should work on Windows again
+* Less strict lifetime bound in deserialization
+* Simplify Key trait usage
+
 ## Version 0.8
 
 New features:

src/dds/pubsub.rs

@@ -38,7 +38,6 @@ use crate::{
     reader::ReaderIngredients,
     writer::{WriterCommand, WriterIngredients},
   },
-  security::security_plugins::SecurityPluginsHandle,
   serialization::{cdr_deserializer::CDRDeserializerAdapter, cdr_serializer::CDRSerializerAdapter},
   structure::{
     entity::RTPSEntity,
@@ -53,6 +52,16 @@ use super::{
   with_key::simpledatareader::ReaderCommand,
 };
 
+#[cfg(feature = "security")]
+use crate::{
+  security::security_plugins::SecurityPluginsHandle,
+};
+
+#[cfg(not(feature = "security"))]
+use crate::{
+  no_security::security_plugins::SecurityPluginsHandle,
+};
+
 // -------------------------------------------------------------------
 
 /// DDS Publisher
@@ -250,7 +259,7 @@ impl Publisher {
       .create_datawriter(self, Some(entity_id), topic, qos, writer_like_stateless)
   }
 
-  #[cfg(feature = "security")] // to avoid "never used" warning
+  #[cfg(feature="security")]  // to avoid "never used" warning
   pub(crate) fn create_datawriter_with_entity_id_no_key<D, SA>(
     &self,
     entity_id: EntityId,
@@ -791,7 +800,7 @@ impl Subscriber {
       .create_datareader(self, topic, Some(entity_id), qos, reader_like_stateless)
   }
 
-  #[cfg(feature = "security")] // to avoid "never used" warning
+  #[cfg(feature="security")]  // to avoid "never used" warning
   pub(crate) fn create_datareader_with_entity_id_no_key<D: 'static, SA>(
     &self,
     topic: &Topic,

src/lib.rs

@@ -177,8 +177,6 @@ mod security;
 
 #[cfg(not(feature = "security"))]
 mod no_security;
-#[cfg(not(feature = "security"))]
-use no_security as security;
 
 pub(crate) mod structure;
 
@@ -189,6 +187,8 @@ mod mio_source;
 
 // Public modules
 pub mod dds; // this is public, but not advertised
+
+#[deprecated(since = "0.8.5", note = "Use crate ros2-client instead.")]
 pub mod ros2;
 /// Helpers for (De)serialization and definitions of (De)serializer adapters
 pub mod serialization;

src/rtps/dp_event_loop.rs

@@ -26,7 +26,6 @@ use crate::{
     rtps_writer_proxy::RtpsWriterProxy,
     writer::{Writer, WriterIngredients},
   },
-  security::security_plugins::SecurityPluginsHandle,
   structure::{
     dds_cache::DDSCache,
     entity::RTPSEntity,
@@ -35,6 +34,12 @@ use crate::{
 };
 #[cfg(feature = "security")]
 use crate::discovery::secure_discovery::AuthenticationStatus;
+#[cfg(feature = "security")]
+use crate::security::security_plugins::SecurityPluginsHandle;
+
+#[cfg(not(feature = "security"))]
+use crate::no_security::security_plugins::SecurityPluginsHandle;
+
 
 pub struct DomainInfo {
   pub domain_participant_guid: GUID,