Skip to content

Commit a3c38eb

Browse files
evoskuilevoskuil
committed
Merge pull request #40 from evoskuil/master
Problem: cannot apply a certificate after construct.
2 parents 5db1042 + 3ef5261 commit a3c38eb

File tree

8 files changed

+32
-22
lines changed

8 files changed

+32
-22
lines changed

‎builds/msvc/resource.rc

0 Bytes
Binary file not shown.

‎builds/msvc/vs2013/czmq.import.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<PreprocessorDefinitions Condition="'$(Linkage-czmq)' == 'static' Or '$(Linkage-czmq)' == 'ltcg'">LIBCZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2020
</ClCompile>
2121
<Link>
22-
<AdditionalDependencies Condition="'$(Linkage-czmq)' != ''">czmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
22+
<!-- rpcrt4.lib is required for UuidCreate -->
23+
<AdditionalDependencies Condition="'$(Linkage-czmq)' != ''">rpcrt4.lib;czmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
2324
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\czmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-czmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
2425
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\czmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-czmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
2526
</Link>

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.65])
2-
AC_INIT([libczmqpp], [1.1.0], [[email protected]])
2+
AC_INIT([libczmqpp], [1.2.0], [[email protected]])
33
AC_LANG(C++)
44
AC_CONFIG_AUX_DIR([build-aux])
55
AC_CONFIG_MACRO_DIR([m4])

‎include/czmq++/certificate.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class CZMQPP_API certificate
3838
~certificate();
3939

4040
void reset(zcert_t* self);
41+
void reset(const std::string& filename);
4142
zcert_t* self();
4243
bool valid() const;
4344

‎packaging/nuget/package.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- These values are populated into the package.gsl templates by package.bat. -->
33
<!-- The target attribute controls path and file name only, id controls package naming. -->
4-
<package id="czmqpp_vc120" target="czmqpp" version = "1.1.0.0" pathversion="1_1_0_0" platformtoolset="v120">
5-
<dependency id="czmq_vc120" version="3.0.1.0" />
4+
<package id="czmqpp_vc120" target="czmqpp" version = "1.2.0.0" pathversion="1_2_0_0" platformtoolset="v120">
5+
<dependency id="czmq_vc120" version="3.0.2.0" />
66
</package>

‎packaging/nuget/package.nuspec

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
88
<metadata minClientVersion="2.5">
99
<id>czmqpp_vc120</id>
10-
<version>1.1.0.0</version>
10+
<version>1.2.0.0</version>
1111
<title>czmqpp_vc120</title>
1212
<authors>Amir Taaki</authors>
1313
<owners>Eric Voskuil</owners>
@@ -22,7 +22,7 @@
2222
<copyright>GNU AFFERO GPL</copyright>
2323
<tags>native, czmqpp, czmq++, czmq, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
2424
<dependencies>
25-
<dependency id="czmq_vc120" version="3.0.1.0" />
25+
<dependency id="czmq_vc120" version="3.0.2.0" />
2626
</dependencies>
2727
</metadata>
2828
<files>
@@ -44,20 +44,20 @@
4444
<!-- libraries -->
4545

4646
<!-- x86 Static libraries (.lib) -->
47-
<file src="..\..\bin\Win32\Release\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-s-1_1_0_0.lib" />
48-
<file src="..\..\bin\Win32\Debug\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-sgd-1_1_0_0.lib" />
47+
<file src="..\..\bin\Win32\Release\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-s-1_2_0_0.lib" />
48+
<file src="..\..\bin\Win32\Debug\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-sgd-1_2_0_0.lib" />
4949

5050
<!-- x86 Static link time code generation libraries (.ltcg.lib) -->
51-
<file src="..\..\bin\Win32\Release\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-s-1_1_0_0.ltcg.lib" />
52-
<file src="..\..\bin\Win32\Debug\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-sgd-1_1_0_0.ltcg.lib" />
51+
<file src="..\..\bin\Win32\Release\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-s-1_2_0_0.ltcg.lib" />
52+
<file src="..\..\bin\Win32\Debug\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x86-v120-mt-sgd-1_2_0_0.ltcg.lib" />
5353

5454
<!-- x64 Static libraries (.lib) -->
55-
<file src="..\..\bin\x64\Release\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-s-1_1_0_0.lib" />
56-
<file src="..\..\bin\x64\Debug\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-sgd-1_1_0_0.lib" />
55+
<file src="..\..\bin\x64\Release\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-s-1_2_0_0.lib" />
56+
<file src="..\..\bin\x64\Debug\v120\static\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-sgd-1_2_0_0.lib" />
5757

5858
<!-- x64 Static link time code generation libraries (.ltcg.lib) -->
59-
<file src="..\..\bin\Win32\Release\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-s-1_1_0_0.ltcg.lib" />
60-
<file src="..\..\bin\Win32\Debug\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-sgd-1_1_0_0.ltcg.lib" />
59+
<file src="..\..\bin\Win32\Release\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-s-1_2_0_0.ltcg.lib" />
60+
<file src="..\..\bin\Win32\Debug\v120\ltcg\czmqpp.lib" target="build\native\bin\czmqpp-x64-v120-mt-sgd-1_2_0_0.ltcg.lib" />
6161
</files>
6262
<!--
6363
#################################################################

‎packaging/nuget/package.targets

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,44 +29,44 @@
2929
<!-- static libraries -->
3030
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
3131
<Link>
32-
<AdditionalDependencies>czmqpp-x86-v120-mt-s-1_1_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
32+
<AdditionalDependencies>czmqpp-x86-v120-mt-s-1_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
3333
</Link>
3434
</ItemDefinitionGroup>
3535
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
3636
<Link>
37-
<AdditionalDependencies>czmqpp-x86-v120-mt-sgd-1_1_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
37+
<AdditionalDependencies>czmqpp-x86-v120-mt-sgd-1_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
3838
</Link>
3939
</ItemDefinitionGroup>
4040
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
4141
<Link>
42-
<AdditionalDependencies>czmqpp-x64-v120-mt-s-1_1_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
42+
<AdditionalDependencies>czmqpp-x64-v120-mt-s-1_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
4343
</Link>
4444
</ItemDefinitionGroup>
4545
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
4646
<Link>
47-
<AdditionalDependencies>czmqpp-x64-v120-mt-sgd-1_1_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
47+
<AdditionalDependencies>czmqpp-x64-v120-mt-sgd-1_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
4848
</Link>
4949
</ItemDefinitionGroup>
5050

5151
<!-- static ltcg libraries -->
5252
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
5353
<Link>
54-
<AdditionalDependencies>czmqpp-x86-v120-mt-s-1_1_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
54+
<AdditionalDependencies>czmqpp-x86-v120-mt-s-1_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
5555
</Link>
5656
</ItemDefinitionGroup>
5757
<ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
5858
<Link>
59-
<AdditionalDependencies>czmqpp-x86-v120-mt-sgd-1_1_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
59+
<AdditionalDependencies>czmqpp-x86-v120-mt-sgd-1_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
6060
</Link>
6161
</ItemDefinitionGroup>
6262
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
6363
<Link>
64-
<AdditionalDependencies>czmqpp-x64-v120-mt-s-1_1_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
64+
<AdditionalDependencies>czmqpp-x64-v120-mt-s-1_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
6565
</Link>
6666
</ItemDefinitionGroup>
6767
<ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-czmqpp)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
6868
<Link>
69-
<AdditionalDependencies>czmqpp-x64-v120-mt-sgd-1_1_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
69+
<AdditionalDependencies>czmqpp-x64-v120-mt-sgd-1_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
7070
</Link>
7171
</ItemDefinitionGroup>
7272

‎src/certificate.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ void certificate::reset(zcert_t* self)
5858
// May be invalid.
5959
self_ = self;
6060
}
61+
void certificate::reset(const std::string& filename)
62+
{
63+
if (valid())
64+
zcert_destroy(&self_);
65+
66+
// May be invalid.
67+
self_ = zcert_load(filename.c_str());
68+
}
6169
zcert_t* certificate::self()
6270
{
6371
return self_;

0 commit comments

Comments
 (0)