Amebis/WinStd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update security helper templates

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-06-13 06:22:24 +02:00
parent f47faea71b
commit badfb43772
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/WinStd/Sec.h
View File

@ -63,7 +63,7 @@ namespace winstd
///
/// PCredHandle wrapper class
///
class WINSTD_API sec_credentials : public handle<PCredHandle>
class WINSTD_API sec_credentials : public handle<PCredHandle, NULL>
{
WINSTD_NONCOPYABLE(sec_credentials)
@ -95,7 +95,7 @@ namespace winstd
///
inline sec_credentials(_Inout_ sec_credentials &&h) :
m_expires(std::move(h.m_expires)),
handle<PCredHandle>(std::move(h))
handle<PCredHandle, NULL>(std::move(h))
{
}
@ -114,8 +114,8 @@ namespace winstd
sec_credentials& operator=(_Inout_ sec_credentials &&h)
{
if (this != std::addressof(h)) {
*(handle<handle_type>*)this = std::move(h);
m_expires = std::move(h.m_expires);
*(handle<handle_type, NULL>*)this = std::move(h);
m_expires = std::move(h.m_expires);
}
return *this;
}
@ -165,7 +165,7 @@ namespace winstd
///
/// PCtxtHandle wrapper class
///
class WINSTD_API sec_context : public handle<PCtxtHandle>
class WINSTD_API sec_context : public handle<PCtxtHandle, NULL>
{
public:
///
@ -173,7 +173,7 @@ namespace winstd
///
inline sec_context() :
m_attrib(0),
handle<PCtxtHandle>()
handle<PCtxtHandle, NULL>()
{
m_expires.QuadPart = -1;
}
@ -186,7 +186,7 @@ namespace winstd
inline sec_context(_Inout_ sec_context &&h) :
m_attrib (std::move(h.m_attrib )),
m_expires(std::move(h.m_expires)),
handle<PCtxtHandle>(std::move(h))
handle<PCtxtHandle, NULL>(std::move(h))
{
}
@ -205,7 +205,7 @@ namespace winstd
sec_context& operator=(_Inout_ sec_context &&h)
{
if (this != std::addressof(h)) {
*(handle<handle_type>*)this = std::move(h);
*(handle<handle_type, NULL>*)this = std::move(h);
m_attrib = std::move(h.m_attrib);
m_expires = std::move(h.m_expires);
}

4
src/Sec.cpp
View File

@ -29,7 +29,7 @@
winstd::sec_credentials::~sec_credentials()
{
if (m_h) {
if (m_h != invalid) {
FreeCredentialsHandle(m_h);
delete m_h;
}
@ -49,7 +49,7 @@ void winstd::sec_credentials::free_internal()
winstd::sec_context::~sec_context()
{
if (m_h) {
if (m_h != invalid) {
DeleteSecurityContext(m_h);
delete m_h;
}