From c79d3e74cfa8fc698b7b9d4f0e0ee2ed7624aa5d Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 8 Jun 2016 15:31:07 +0200 Subject: [PATCH] CredWrite modified to use shared code for credential storage from EAPMethods --- CredWrite/CredWrite.props | 3 ++- CredWrite/CredWrite.rc | Bin 5792 -> 5912 bytes CredWrite/CredWrite.vcxproj | 4 ++++ CredWrite/CredWrite.vcxproj.filters | 3 +++ CredWrite/Main.cpp | Bin 13430 -> 7124 bytes CredWrite/README.md | 5 ++--- CredWrite/StdAfx.h | Bin 1972 -> 2056 bytes 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CredWrite/CredWrite.props b/CredWrite/CredWrite.props index 2b4b508..b20e0cd 100644 --- a/CredWrite/CredWrite.props +++ b/CredWrite/CredWrite.props @@ -7,7 +7,8 @@ - ..\lib\WinStd\include;%(AdditionalIncludeDirectories) + ..\EAPMethods\EAPMethodEvents\temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories) + EAPMETHOD_TYPE=0;%(PreprocessorDefinitions) diff --git a/CredWrite/CredWrite.rc b/CredWrite/CredWrite.rc index ffc2bf6c9c846f910bf5dc6092d2d8183ebb6203..3b5e8ac7dba2f3eb89be38ac583e06bfb3c3fec0 100644 GIT binary patch delta 101 zcmZ3WJ40`S9ou9lHlfK}Y+S;w42}!|489Dh3?&R14EYQx48@ZLImNjl;(9!BK6_fw~ delta 19 bcmbQCw?KD;9oyz9Y&)134L9d=uH*#(M{fqA diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index 3726643..bf84d36 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -86,6 +86,7 @@ + Create @@ -98,6 +99,9 @@ + + {d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b} + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/CredWrite/CredWrite.vcxproj.filters b/CredWrite/CredWrite.vcxproj.filters index 21c5de5..7e3a58f 100644 --- a/CredWrite/CredWrite.vcxproj.filters +++ b/CredWrite/CredWrite.vcxproj.filters @@ -26,6 +26,9 @@ Source Files + + Source Files + diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp index 81ecb02ffcd82a2c4c2ba26a0a5a300bcf321530..06dd8253420f96628385a69de0aaf6d81ffca620 100644 GIT binary patch delta 864 zcmZvaOHUI~6vt07Hl1l{hY_4qlG2hsX0$XTO?(DJ1EX| z!ez}Nu8fawKr*^|a#&fgN3CQiMDe2#E;5w8tci*riOU&&WOQ2vMFqap5% zB)Df?d+1P&7NK`&3ATWhrOSxs1hsPzs~tqVO~a((u5a^H4}9nG-=tlr1WG0A+vS>V zOqqkH@SDLpVeTM1Nh-+X2PK0uS4M9Z&v@4&3%XpOK4ElenI6*|%)xG%U)tlG)M6tc z?%-yBymGz(whsTc3yqKuP0<~^yab*tP|YFp9b_XAxeLNI+C<~apg3D8^REY9$JJs_ zPxB`&c5h(PsDh5loCPW_uk@$hW`r{Azuy8r(<|EPZb3;zMV A+W-In literal 13430 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 Ds1|U8 diff --git a/CredWrite/README.md b/CredWrite/README.md index 6f68729..b5ff61b 100644 --- a/CredWrite/README.md +++ b/CredWrite/README.md @@ -1,5 +1,5 @@ #CredWrite -Imports given credentials to Windows Credential Manager for GEANTLink use +Imports given credentials to Windows Credential Manager for GÉANTLink use ##Usage ``` @@ -16,5 +16,4 @@ Return codes: - -1 = Invalid parameters - 0 = Success - 1 = Error parsing command line -- 2 = Error encrypting password -- 3 = Error writing credentials to Credential Manager +- 2 = Error encrypting password or writing credentials diff --git a/CredWrite/StdAfx.h b/CredWrite/StdAfx.h index 6eb48dbc27f9789a086ac040db6711164d5725d4..5d3a928b6f63f1b1bc42adfb1d9bb2cdb448020a 100644 GIT binary patch delta 64 zcmdnO-yyJ}fX!HmK@SM^8C)4083Gu58B!Ta7%~|08B!REfuflVc?`)6ISi#hekx4W JW`DL+MgXDz43Yo< delta 16 XcmeAW*uuY|fNin?yTIlvY$l8VFYN^$