Browse Source

build and have init() inside

generate_api
Volker Birk 4 years ago
parent
commit
201ac3144c
7 changed files with 606 additions and 15 deletions
  1. +3
    -0
      build-windows/generate_code.cmd
  2. +29
    -0
      build-windows/libpEpasn1/ReadMe.txt
  3. +247
    -0
      build-windows/libpEpasn1/libpEpasn1.vcxproj
  4. +315
    -0
      build-windows/libpEpasn1/libpEpasn1.vcxproj.filters
  5. +6
    -6
      build-windows/pEpEngine.vcxproj
  6. +6
    -3
      src/keymanagement.c
  7. +0
    -6
      src/keymanagement.h

+ 3
- 0
build-windows/generate_code.cmd View File

@ -20,4 +20,7 @@ del *.c*
del *-sample.c
cd %1\..
if not exist pEp mklink /d pEp pEpEngine\src
popd

+ 29
- 0
build-windows/libpEpasn1/ReadMe.txt View File

@ -0,0 +1,29 @@
========================================================================
STATIC LIBRARY : libpEpasn1 Project Overview
========================================================================
AppWizard has created this libpEpasn1 library project for you.
No source files were created as part of your project.
libpEpasn1.vcxproj
This is the main project file for VC++ projects generated using an Application Wizard.
It contains information about the version of Visual C++ that generated the file, and
information about the platforms, configurations, and project features selected with the
Application Wizard.
libpEpasn1.vcxproj.filters
This is the filters file for VC++ projects generated using an Application Wizard.
It contains information about the association between the files in your project
and the filters. This association is used in the IDE to show grouping of files with
similar extensions under a specific node (for e.g. ".cpp" files are associated with the
"Source Files" filter).
/////////////////////////////////////////////////////////////////////////////
Other notes:
AppWizard uses "TODO:" comments to indicate parts of the source code you
should add to or customize.
/////////////////////////////////////////////////////////////////////////////

+ 247
- 0
build-windows/libpEpasn1/libpEpasn1.vcxproj View File

@ -0,0 +1,247 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{9A67164D-B8F8-4601-A24B-28AFE774D41C}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libpEpasn1</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>C:\Users\vb\Documents\Visual Studio 2015\Projects\pEp_for_Outlook_Solution\pEpEngine\asn.1;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>C:\Users\vb\Documents\Visual Studio 2015\Projects\pEp_for_Outlook_Solution\pEpEngine\asn.1;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
<PreBuildEvent>
<Command>"$(ProjectDir)..\generate_code.cmd" "$(ProjectDir)..\.."</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>"$(ProjectDir)..\generate_code.cmd" "$(ProjectDir)..\.."</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\asn.1\asn_application.h" />
<ClInclude Include="..\..\asn.1\asn_codecs.h" />
<ClInclude Include="..\..\asn.1\asn_codecs_prim.h" />
<ClInclude Include="..\..\asn.1\asn_internal.h" />
<ClInclude Include="..\..\asn.1\asn_SEQUENCE_OF.h" />
<ClInclude Include="..\..\asn.1\asn_SET_OF.h" />
<ClInclude Include="..\..\asn.1\asn_system.h" />
<ClInclude Include="..\..\asn.1\Beacon.h" />
<ClInclude Include="..\..\asn.1\ber_decoder.h" />
<ClInclude Include="..\..\asn.1\ber_tlv_length.h" />
<ClInclude Include="..\..\asn.1\ber_tlv_tag.h" />
<ClInclude Include="..\..\asn.1\BIT_STRING.h" />
<ClInclude Include="..\..\asn.1\BOOLEAN.h" />
<ClInclude Include="..\..\asn.1\CommitAccept.h" />
<ClInclude Include="..\..\asn.1\CommitReject.h" />
<ClInclude Include="..\..\asn.1\constraints.h" />
<ClInclude Include="..\..\asn.1\constr_CHOICE.h" />
<ClInclude Include="..\..\asn.1\constr_SEQUENCE.h" />
<ClInclude Include="..\..\asn.1\constr_SEQUENCE_OF.h" />
<ClInclude Include="..\..\asn.1\constr_SET_OF.h" />
<ClInclude Include="..\..\asn.1\constr_TYPE.h" />
<ClInclude Include="..\..\asn.1\der_encoder.h" />
<ClInclude Include="..\..\asn.1\GroupKeys.h" />
<ClInclude Include="..\..\asn.1\GroupKeysAndClose.h" />
<ClInclude Include="..\..\asn.1\HandshakeAnswer.h" />
<ClInclude Include="..\..\asn.1\HandshakeRequest.h" />
<ClInclude Include="..\..\asn.1\Hash.h" />
<ClInclude Include="..\..\asn.1\Hex.h" />
<ClInclude Include="..\..\asn.1\Identity.h" />
<ClInclude Include="..\..\asn.1\IdentityList.h" />
<ClInclude Include="..\..\asn.1\INTEGER.h" />
<ClInclude Include="..\..\asn.1\ISO639-1.h" />
<ClInclude Include="..\..\asn.1\KeySync.h" />
<ClInclude Include="..\..\asn.1\NativeEnumerated.h" />
<ClInclude Include="..\..\asn.1\NativeInteger.h" />
<ClInclude Include="..\..\asn.1\OCTET_STRING.h" />
<ClInclude Include="..\..\asn.1\per_decoder.h" />
<ClInclude Include="..\..\asn.1\per_encoder.h" />
<ClInclude Include="..\..\asn.1\per_opentype.h" />
<ClInclude Include="..\..\asn.1\per_support.h" />
<ClInclude Include="..\..\asn.1\PrintableString.h" />
<ClInclude Include="..\..\asn.1\PString.h" />
<ClInclude Include="..\..\asn.1\Rollback.h" />
<ClInclude Include="..\..\asn.1\Sync.h" />
<ClInclude Include="..\..\asn.1\TID.h" />
<ClInclude Include="..\..\asn.1\UTF8String.h" />
<ClInclude Include="..\..\asn.1\Version.h" />
<ClInclude Include="..\..\asn.1\xer_decoder.h" />
<ClInclude Include="..\..\asn.1\xer_encoder.h" />
<ClInclude Include="..\..\asn.1\xer_support.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\asn.1\asn_codecs_prim.c" />
<ClCompile Include="..\..\asn.1\asn_SEQUENCE_OF.c" />
<ClCompile Include="..\..\asn.1\asn_SET_OF.c" />
<ClCompile Include="..\..\asn.1\Beacon.c" />
<ClCompile Include="..\..\asn.1\ber_decoder.c" />
<ClCompile Include="..\..\asn.1\ber_tlv_length.c" />
<ClCompile Include="..\..\asn.1\ber_tlv_tag.c" />
<ClCompile Include="..\..\asn.1\BIT_STRING.c" />
<ClCompile Include="..\..\asn.1\BOOLEAN.c" />
<ClCompile Include="..\..\asn.1\CommitAccept.c" />
<ClCompile Include="..\..\asn.1\CommitReject.c" />
<ClCompile Include="..\..\asn.1\constraints.c" />
<ClCompile Include="..\..\asn.1\constr_CHOICE.c" />
<ClCompile Include="..\..\asn.1\constr_SEQUENCE.c" />
<ClCompile Include="..\..\asn.1\constr_SEQUENCE_OF.c" />
<ClCompile Include="..\..\asn.1\constr_SET_OF.c" />
<ClCompile Include="..\..\asn.1\constr_TYPE.c" />
<ClCompile Include="..\..\asn.1\der_encoder.c" />
<ClCompile Include="..\..\asn.1\GroupKeys.c" />
<ClCompile Include="..\..\asn.1\GroupKeysAndClose.c" />
<ClCompile Include="..\..\asn.1\HandshakeAnswer.c" />
<ClCompile Include="..\..\asn.1\HandshakeRequest.c" />
<ClCompile Include="..\..\asn.1\Hash.c" />
<ClCompile Include="..\..\asn.1\Hex.c" />
<ClCompile Include="..\..\asn.1\Identity.c" />
<ClCompile Include="..\..\asn.1\IdentityList.c" />
<ClCompile Include="..\..\asn.1\INTEGER.c" />
<ClCompile Include="..\..\asn.1\ISO639-1.c" />
<ClCompile Include="..\..\asn.1\KeySync.c" />
<ClCompile Include="..\..\asn.1\NativeEnumerated.c" />
<ClCompile Include="..\..\asn.1\NativeInteger.c" />
<ClCompile Include="..\..\asn.1\OCTET_STRING.c" />
<ClCompile Include="..\..\asn.1\pdu_collection.c" />
<ClCompile Include="..\..\asn.1\per_decoder.c" />
<ClCompile Include="..\..\asn.1\per_encoder.c" />
<ClCompile Include="..\..\asn.1\per_opentype.c" />
<ClCompile Include="..\..\asn.1\per_support.c" />
<ClCompile Include="..\..\asn.1\PrintableString.c" />
<ClCompile Include="..\..\asn.1\PString.c" />
<ClCompile Include="..\..\asn.1\Rollback.c" />
<ClCompile Include="..\..\asn.1\Sync.c" />
<ClCompile Include="..\..\asn.1\TID.c" />
<ClCompile Include="..\..\asn.1\UTF8String.c" />
<ClCompile Include="..\..\asn.1\Version.c" />
<ClCompile Include="..\..\asn.1\xer_decoder.c" />
<ClCompile Include="..\..\asn.1\xer_encoder.c" />
<ClCompile Include="..\..\asn.1\xer_support.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

+ 315
- 0
build-windows/libpEpasn1/libpEpasn1.vcxproj.filters View File

@ -0,0 +1,315 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\asn.1\asn_application.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\asn_codecs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\asn_codecs_prim.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\asn_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\asn_SEQUENCE_OF.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\asn_SET_OF.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\asn_system.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Beacon.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\ber_decoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\ber_tlv_length.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\ber_tlv_tag.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\BIT_STRING.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\BOOLEAN.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\CommitAccept.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\CommitReject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\constr_CHOICE.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\constr_SEQUENCE.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\constr_SEQUENCE_OF.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\constr_SET_OF.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\constr_TYPE.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\constraints.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\der_encoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\GroupKeys.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\GroupKeysAndClose.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\HandshakeAnswer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\HandshakeRequest.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Hash.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Hex.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Identity.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\IdentityList.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\INTEGER.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\ISO639-1.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\KeySync.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\NativeEnumerated.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\NativeInteger.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\OCTET_STRING.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\per_decoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\per_encoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\per_opentype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\per_support.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\PrintableString.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\PString.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Rollback.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Sync.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\TID.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\UTF8String.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\xer_decoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\xer_encoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\asn.1\xer_support.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\asn.1\asn_codecs_prim.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\asn_SEQUENCE_OF.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\asn_SET_OF.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Beacon.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\ber_decoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\ber_tlv_length.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\ber_tlv_tag.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\BIT_STRING.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\BOOLEAN.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\CommitAccept.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\CommitReject.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\constr_CHOICE.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\constr_SEQUENCE.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\constr_SEQUENCE_OF.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\constr_SET_OF.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\constr_TYPE.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\constraints.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\der_encoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\GroupKeys.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\GroupKeysAndClose.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\HandshakeAnswer.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\HandshakeRequest.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Hash.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Hex.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Identity.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\IdentityList.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\INTEGER.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\ISO639-1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\KeySync.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\NativeEnumerated.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\NativeInteger.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\OCTET_STRING.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\pdu_collection.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\per_decoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\per_encoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\per_opentype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\per_support.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\PrintableString.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\PString.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Rollback.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Sync.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\TID.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\UTF8String.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\Version.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\xer_decoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\xer_encoder.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\asn.1\xer_support.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

+ 6
- 6
build-windows/pEpEngine.vcxproj View File

@ -65,11 +65,11 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(TargetDir)\pEpEngineASN1.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>"$(SysProjectDir)generate_code.cmd" "$(ProjectDir).."
</Command>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -92,11 +92,11 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>$(TargetDir)\pEpEngineASN1.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>"$(SysProjectDir)generate_code.cmd" "$(ProjectDir).."
</Command>
<Command>
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>


+ 6
- 3
src/keymanagement.c View File

@ -1118,13 +1118,16 @@ DYNAMIC_API PEP_STATUS register_examine_function(
}
DYNAMIC_API PEP_STATUS do_keymanagement(
PEP_SESSION session,
retrieve_next_identity_t retrieve_next_identity,
void *management
)
{
PEP_SESSION session;
pEp_identity *identity;
PEP_STATUS status;
PEP_STATUS status = init(&session, NULL, NULL);
assert(!status);
if (status)
return status;
assert(session && retrieve_next_identity);
if (!(session && retrieve_next_identity))
@ -1153,7 +1156,7 @@ DYNAMIC_API PEP_STATUS do_keymanagement(
}
log_event(session, "keymanagement thread shutdown", "pEp engine", NULL, NULL);
release(session);
return PEP_STATUS_OK;
}


+ 0
- 6
src/keymanagement.h View File

@ -164,14 +164,9 @@ DYNAMIC_API PEP_STATUS register_examine_function(
// do_keymanagement() - function to be run on an extra thread
//
// parameters:
// session (in) session to use
// retrieve_next_identity (in) pointer to retrieve_next_identity()
// callback which returns at least a valid
// address field in the identity struct
// messageToSend (in) callback for sending message by the
// application
// management (in) management data to give to keymanagement
// (implementation defined)
//
// return value:
// PEP_STATUS_OK if thread has to terminate successfully or any other
@ -187,7 +182,6 @@ DYNAMIC_API PEP_STATUS register_examine_function(
// if transport system is not used it must not be NULL
DYNAMIC_API PEP_STATUS do_keymanagement(
PEP_SESSION session,
retrieve_next_identity_t retrieve_next_identity,
void *management
);


Loading…
Cancel
Save