Skip to content

Commit 01d8a82

Browse files
francois-normandinfrancois-normandin
committed
Merge branch 'release/3.2.0'
2 parents 892e60b + 905c32b commit 01d8a82

15 files changed

+137
-24
lines changed

‎Connection.TCP.TLS.lvproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,28 @@
3333
<Item Name="MD5Checksum string.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum string.vi"/>
3434
<Item Name="MQTT Base.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Connection/MQTT_Base/MQTT Base.lvlib"/>
3535
<Item Name="MQTT Client.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Client/MQTT Client.lvlib"/>
36-
<Item Name="MQTT Server.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Broker/MQTT Server.lvlib"/>
3736
<Item Name="MQTT_Connection.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Connection/MQTT_Connection/MQTT_Connection.lvlib"/>
3837
<Item Name="MQTT_Control_Packets.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Control Packets/Control Packets/MQTT_Control_Packets.lvlib"/>
3938
<Item Name="MQTT_TCP.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT TCP Connection/MQTT_TCP/MQTT_TCP.lvlib"/>
4039
<Item Name="OpenDescriptor.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/TypeDescriptor/OpenDescriptor.lvlib"/>
4140
<Item Name="OpenSerializer.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/OpenSerializer/OpenSerializer.lvlib"/>
4241
<Item Name="OpenVariant.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Variant/OpenVariant.lvlib"/>
4342
<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
43+
<Item Name="Get Semaphore Status.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Get Semaphore Status.vi"/>
44+
<Item Name="Semaphore RefNum" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Semaphore RefNum"/>
45+
<Item Name="Semaphore Refnum Core.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Semaphore Refnum Core.ctl"/>
46+
<Item Name="RemoveNamedSemaphorePrefix.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/RemoveNamedSemaphorePrefix.vi"/>
47+
<Item Name="GetNamedSemaphorePrefix.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/GetNamedSemaphorePrefix.vi"/>
48+
<Item Name="Acquire Semaphore.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Acquire Semaphore.vi"/>
49+
<Item Name="Release Semaphore.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Release Semaphore.vi"/>
50+
<Item Name="Not A Semaphore.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Not A Semaphore.vi"/>
51+
<Item Name="Obtain Semaphore Reference.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Obtain Semaphore Reference.vi"/>
52+
<Item Name="AddNamedSemaphorePrefix.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/AddNamedSemaphorePrefix.vi"/>
53+
<Item Name="Validate Semaphore Size.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/semaphor.llb/Validate Semaphore Size.vi"/>
54+
<Item Name="Stall Data Flow.vim" Type="VI" URL="/&lt;vilib&gt;/Utility/Stall Data Flow.vim"/>
55+
<Item Name="Assert Array Dimension Sizes.vim" Type="VI" URL="/&lt;vilib&gt;/Utility/TypeAssert/Assert Array Dimension Sizes.vim"/>
56+
<Item Name="Create Server.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Broker/Server class/Create Server.vi"/>
57+
<Item Name="Read Server Public Events.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Broker/Server class/Read Server Public Events.vi"/>
4458
</Item>
4559
</Item>
4660
<Item Name="Build Specifications" Type="Build"/>

‎MQTT TCP TLS Connection.vipb‎

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-10-23 17:15:04" Creator="normandinf" Comments="" ID="f70d37240bbcf3015f086edec99a5e17">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2022-04-17 18:48:43" Creator="normandinf" Comments="" ID="b8f0762fdd40f8fc81d940b2a9dc5291">
22
<Library_General_Settings>
33
<Package_File_Name>LabVIEW_Open_Source_Project_lib_MQTT_SecuredTCP_Connection</Package_File_Name>
4-
<Library_Version>3.1.1.2</Library_Version>
4+
<Library_Version>3.2.0.4</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>source</Library_Source_Folder>
77
<Library_Output_Folder>.</Library_Output_Folder>
@@ -17,11 +17,10 @@
1717
</Library_General_Settings>
1818
<Advanced_Settings>
1919
<Package_Dependencies>
20-
<External_Dependencies>labview_open_source_project_lib_mqtt_connection &gt;= 3.1.1.13</External_Dependencies>
21-
<External_Dependencies>labview_open_source_project_lib_mqtt_tcp_connection &gt;= 3.1.1.5</External_Dependencies>
22-
<Additional_External_Dependencies>labview_open_source_project_lib_labview_open_source_palette &gt;=1.0.0.1</Additional_External_Dependencies>
23-
<Direct_Dependencies>labview_open_source_project_lib_mqtt_connection-3.1.1.13</Direct_Dependencies>
24-
<Direct_Dependencies>labview_open_source_project_lib_mqtt_tcp_connection-3.1.1.5</Direct_Dependencies>
20+
<External_Dependencies>labview_open_source_project_lib_mqtt_connection &gt;= 3.1.4.22</External_Dependencies>
21+
<External_Dependencies>labview_open_source_project_lib_mqtt_tcp_connection &gt;= 3.1.2.6</External_Dependencies>
22+
<Direct_Dependencies>labview_open_source_project_lib_mqtt_connection-3.1.4.22</Direct_Dependencies>
23+
<Direct_Dependencies>labview_open_source_project_lib_mqtt_tcp_connection-3.1.2.6</Direct_Dependencies>
2524
</Package_Dependencies>
2625
<Custom_Action_VIs>
2726
<Pre-Build_VI/>
@@ -41,7 +40,14 @@ This package consists of an extension of the MQTT TCP Connection base class for
4140
<Copyright/>
4241
<Packager/>
4342
<URL>https://github.com/LabVIEW-Open-Source/MQTT-Connection-SecuredTCP</URL>
44-
<Release_Notes>Initial Release of MQTT TCP TLS Connection (extension of MQTT TCP Connection class)</Release_Notes>
43+
<Release_Notes>Support for client certificate and keys
44+
45+
46+
*******************
47+
Thanks to Contributors to this release:
48+
49+
Adam Gluck (@agluck28)
50+
Fran�ois Normandin (@francois-normandin)</Release_Notes>
4551
</Description>
4652
<Destinations>
4753
<Toolkit_VIs>
@@ -176,6 +182,7 @@ This package consists of an extension of the MQTT TCP Connection base class for
176182
<close_labview_before_install>false</close_labview_before_install>
177183
<restart_labview_after_install>false</restart_labview_after_install>
178184
<skip_mass_compile_after_install>false</skip_mass_compile_after_install>
185+
<install_into_global_environment>false</install_into_global_environment>
179186
</LabVIEW>
180187
<VI_Docs>
181188
<Edit_VI_Description>false</Edit_VI_Description>
@@ -191,8 +198,8 @@ This package consists of an extension of the MQTT TCP Connection base class for
191198
<Name>Secured TCP Connection</Name>
192199
<View_Format>Icons</View_Format>
193200
<Size>
194-
<Height_Row>2</Height_Row>
195-
<Width_Col.>4</Width_Col.>
201+
<Height_Row>3</Height_Row>
202+
<Width_Col.>5</Width_Col.>
196203
</Size>
197204
<_256_Color_Icon>00000CA0002800000C9A00000400000000000020002000080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA0000888888888888000077777777777700005555555555550000444444444444000022222222222200001111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FAFAFAFAFAFAFAFA0000000000000000000000000000000000000000000000FAFAFAFAFAFAFAFAFAFA00000000000000000000000000000000000000000000FAFA000000000000FAFA00000000000035000000000000000000000000000000FAFA000000000000FAFA00000000003535350000000000000000000000000000FAFA000000000000FAFA00000000003500353535353535000000000000000000FAFA000000000000FAFA00000000003500353535353535000000000000000000FAFAFAFAFAFAFAFAFAFA0000000000353535003535003500000000000000000000FAFAFAFAFAFAFAFA00000000000000350000003500350000000000000000FAFAFAFAFAFAFAFAFAFAFAFA0000000000000000000000000000000000000000FAFAFAFAFAFAFAFAFAFAFAFA0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FAFA0000000000000000FAFAFAFAFAFAFAFA0000000000000000000000000000FAFA00000000000000FAFAFAFAFAFAFAFAFAFA00000000000000000000000000FAFA00000000000000FAFA000000000000FAFA00000000000000000000000000FAFA00000000000000FAFA000000000000FAFA00000000000000000000000000FAFA00000000000000FAFA000000000000FAFA00000000000000000000000000FAFAFAFAFAFAFA0000FAFA000000000000FAFA00000000000000000000000000FAFAFAFAFAFAFA0000FAFAFAFAFAFAFAFAFAFA0000000000000000000000000000000000000000000000FAFAFAFAFAFAFAFA00000000000000000000000000000000000000000000FAFAFAFAFAFAFAFAFAFAFAFA0000000000000000000000000000000000000000FAFAFAFAFAFAFAFAFAFAFAFA00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FAFAFA0000FAFA0000FAFAFA000000000000000000000000000000000000000000FA0000FA0000FA00FA0000FA0000000000000000000000000000000000000000FA0000FA00000000FAFAFA000000000000000000000000000000000000000000FA0000FA0000FA00FA0000000000000000000000000000000000000000000000FA000000FAFA0000FA000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001FE000003FF000003FF020003FF070003FF07F803FF07F803FF076801FE022807FF800007FF8000000000000000000001807F800180FFC00180FFC00180FFC00180FFC001FCFFC001FCFFC000007F800001FFE00001FFE0000000000000000000399C0000125E0000121C0000125000001190000000000000000000</_256_Color_Icon>
198205
<BW_Color_Icon>00000000</BW_Color_Icon>
@@ -222,32 +229,74 @@ This package consists of an extension of the MQTT TCP Connection base class for
222229
<Items_Data>
223230
<Type>Item</Type>
224231
<Sub_Palette_Index>-1</Sub_Palette_Index>
225-
<NameSub_Menu_Name>Configure Secured TCP Client.vi</NameSub_Menu_Name>
232+
<NameSub_Menu_Name>Add Trusted Certificates.vim</NameSub_Menu_Name>
226233
<Short_Name/>
227234
<is_Merge_VI>false</is_Merge_VI>
228235
<Position>
229236
<Row>1</Row>
230237
<Column>2</Column>
231238
</Position>
232239
<Icon>00000000</Icon>
240+
<Path>source\Connection.SecuredTCP\Add Trusted Certificates.vim</Path>
241+
<VI_Title/>
242+
</Items_Data>
243+
<Items_Data>
244+
<Type>Item</Type>
245+
<Sub_Palette_Index>-1</Sub_Palette_Index>
246+
<NameSub_Menu_Name>Configure Secured TCP Client.vi</NameSub_Menu_Name>
247+
<Short_Name/>
248+
<is_Merge_VI>false</is_Merge_VI>
249+
<Position>
250+
<Row>3</Row>
251+
<Column>1</Column>
252+
</Position>
253+
<Icon>00000000</Icon>
233254
<Path>source\Connection.SecuredTCP\Configure Secured TCP Client.vi</Path>
234255
<VI_Title>Secured TCP Client</VI_Title>
235256
</Items_Data>
257+
<Items_Data>
258+
<Type>Item</Type>
259+
<Sub_Palette_Index>-1</Sub_Palette_Index>
260+
<NameSub_Menu_Name>Configure Secured TCP Client Certificate and Key.vi</NameSub_Menu_Name>
261+
<Short_Name/>
262+
<is_Merge_VI>false</is_Merge_VI>
263+
<Position>
264+
<Row>3</Row>
265+
<Column>2</Column>
266+
</Position>
267+
<Icon>00000000</Icon>
268+
<Path>source\Connection.SecuredTCP\Configure Secured TCP Client Certificate and Key.vi</Path>
269+
<VI_Title/>
270+
</Items_Data>
236271
<Items_Data>
237272
<Type>Item</Type>
238273
<Sub_Palette_Index>-1</Sub_Palette_Index>
239274
<NameSub_Menu_Name>Example Secured TCP Client-Server.vi</NameSub_Menu_Name>
240275
<Short_Name/>
241276
<is_Merge_VI>false</is_Merge_VI>
242277
<Position>
243-
<Row>2</Row>
244-
<Column>4</Column>
278+
<Row>3</Row>
279+
<Column>5</Column>
245280
</Position>
246281
<Icon>00000000</Icon>
247282
<Path>source\Connection.SecuredTCP\Example\Example Secured TCP Client-Server.vi</Path>
248283
<VI_Title/>
249284
</Items_Data>
250-
<GUID>EBCCC602DEDBE535A2D57C999E50C25B</GUID>
285+
<Items_Data>
286+
<Type>Item</Type>
287+
<Sub_Palette_Index>-1</Sub_Palette_Index>
288+
<NameSub_Menu_Name>Read trusted entities.vi</NameSub_Menu_Name>
289+
<Short_Name/>
290+
<is_Merge_VI>false</is_Merge_VI>
291+
<Position>
292+
<Row>1</Row>
293+
<Column>3</Column>
294+
</Position>
295+
<Icon>00000000</Icon>
296+
<Path>source\Connection.SecuredTCP\Read trusted entities.vi</Path>
297+
<VI_Title/>
298+
</Items_Data>
299+
<GUID>78D7F2906B3629383F8FE8CDD0C7DD98</GUID>
251300
</Functions_Palette_Data>
252301
</Library_Palette_Definition>
253302
</VI_Package_Builder_Settings>

‎MQTT TCP TLS Connection.vipc‎

1.13 KB
Binary file not shown.

‎source/Connection.SecuredTCP/Add Trusted Certificates.vim‎

54 KB
Binary file not shown.

‎source/Connection.SecuredTCP/Configure Secured TCP Client Certificate and Key.vi‎

23.8 KB
Binary file not shown.

‎source/Connection.SecuredTCP/Configure Secured TCP Client.vi‎

-2.42 KB
Binary file not shown.

‎source/Connection.SecuredTCP/Configure Secured TCP Server.vi‎

380 Bytes
Binary file not shown.

‎source/Connection.SecuredTCP/Connection.TCP-TLS.lvclass‎

Lines changed: 59 additions & 9 deletions
Large diffs are not rendered by default.

‎source/Connection.SecuredTCP/Example/Example Secured TCP Client-Server.vi‎

110 KB
Binary file not shown.

‎source/Connection.SecuredTCP/Read trusted entities.vi‎

20.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)