[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/monich/harbour-foilauth.git</param>
<param name="branch">master</param>
- <param name="revision">1a98202</param>
+ <param name="revision">bf9f887</param>
</service>
</services>
\ No newline at end of file
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/README
^
|
@@ -1 +0,0 @@
-Yet another glib-style crypto API.
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/libfoil/libfoil.dsp
^
|
@@ -1,471 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libfoil" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libfoil - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libfoil.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libfoil.mak" CFG="libfoil - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libfoil - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libfoil - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libfoil - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "src" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /I "$(OPENSSL_ROOT)/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "libfoil - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "src" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /I "$(OPENSSL_ROOT)/include" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "libfoil - Win32 Release"
-# Name "libfoil - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\src\foil_asn1.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_cipher.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_cipher_aes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_cipher_sync.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_cmac.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_digest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_digest_md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_digest_sha1.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_digest_sha256.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_digest_sha512.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_hmac.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input_base64.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input_cipher.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input_digest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input_mem.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_input_range.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_key.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_key_aes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_key_des.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_key_rsa_private.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_key_rsa_public.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\openssl\foil_openssl_rsa.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_output.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_output_base64.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_output_digest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foil_output_file.c
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/libfoilmsg/libfoilmsg.dsp
^
|
@@ -1,123 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libfoilmsg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libfoilmsg - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libfoilmsg.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libfoilmsg.mak" CFG="libfoilmsg - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libfoilmsg - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libfoilmsg - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libfoilmsg - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "src" /I "../libfoil/include" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "libfoilmsg - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "src" /I "../libfoil/include" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "libfoilmsg - Win32 Release"
-# Name "libfoilmsg - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\src\foilmsg_decrypt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\foilmsg_encrypt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\include\foilmsg.h
-# End Source File
-# End Group
-# Begin Group "Internal Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\foilmsg_p.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\Makefile
-# End Source File
-# Begin Source File
-
-SOURCE=.\README
-# End Source File
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/foil_test.dsw
^
|
@@ -1,380 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libfoil"=..\libfoil\libfoil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libfoilmsg"=..\libfoilmsg\libfoilmsg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libglibutil"=..\..\jolla\libglibutil\libglibutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "test_basic"=.\libfoil\test_basic\test_basic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cavp_aes"=.\libfoil\test_cavp_aes\test_cavp_aes.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cavp_cmac"=.\libfoil\test_cavp_cmac\test_cavp_cmac.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cavp_des"=.\libfoil\test_cavp_des\test_cavp_des.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cipher"=.\libfoil\test_cipher\test_cipher.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cipher_aes"=.\libfoil\test_cipher_aes\test_cipher_aes.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cipher_des"=.\libfoil\test_cipher_des\test_cipher_des.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cipher_rsa"=.\libfoil\test_cipher_rsa\test_cipher_rsa.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_cmac"=.\libfoil\test_cmac\test_cmac.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_basic/test_basic.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_basic" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_basic - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_basic.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_basic.mak" CFG="test_basic - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_basic - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_basic - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_basic - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_basic - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_basic - Win32 Release"
-# Name "test_basic - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_basic.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cavp_aes/test_cavp_aes.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cavp_aes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cavp_aes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cavp_aes.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cavp_aes.mak" CFG="test_cavp_aes - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cavp_aes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cavp_aes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cavp_aes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cavp_aes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cavp_aes - Win32 Release"
-# Name "test_cavp_aes - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cavp_aes.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cavp_cmac/test_cavp_cmac.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cavp_cmac" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cavp_cmac - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cavp_cmac.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cavp_cmac.mak" CFG="test_cavp_cmac - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cavp_cmac - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cavp_cmac - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cavp_cmac - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cavp_cmac - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cavp_cmac - Win32 Release"
-# Name "test_cavp_cmac - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cavp_cmac.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cavp_des/test_cavp_des.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cavp_des" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cavp_des - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cavp_des.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cavp_des.mak" CFG="test_cavp_des - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cavp_des - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cavp_des - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cavp_des - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cavp_des - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cavp_des - Win32 Release"
-# Name "test_cavp_des - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cavp_des.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cipher/test_cipher.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cipher" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cipher - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher.mak" CFG="test_cipher - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cipher - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cipher - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cipher - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cipher - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cipher - Win32 Release"
-# Name "test_cipher - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cipher.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cipher_aes/test_cipher_aes.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cipher_aes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cipher_aes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher_aes.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher_aes.mak" CFG="test_cipher_aes - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cipher_aes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cipher_aes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cipher_aes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cipher_aes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cipher_aes - Win32 Release"
-# Name "test_cipher_aes - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cipher_aes.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cipher_des/test_cipher_des.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cipher_des" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cipher_des - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher_des.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher_des.mak" CFG="test_cipher_des - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cipher_des - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cipher_des - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cipher_des - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cipher_des - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cipher_des - Win32 Release"
-# Name "test_cipher_des - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cipher_des.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cipher_rsa/test_cipher_rsa.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cipher_rsa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cipher_rsa - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher_rsa.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cipher_rsa.mak" CFG="test_cipher_rsa - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cipher_rsa - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cipher_rsa - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cipher_rsa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cipher_rsa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cipher_rsa - Win32 Release"
-# Name "test_cipher_rsa - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cipher_rsa.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_cmac/test_cmac.dsp
^
|
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_cmac" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_cmac - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_cmac.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_cmac.mak" CFG="test_cmac - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_cmac - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_cmac - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_cmac - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_cmac - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_cmac - Win32 Release"
-# Name "test_cmac - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_cmac.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_digest/test_digest.dsp
^
|
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_digest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_digest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_digest.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_digest.mak" CFG="test_digest - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_digest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_digest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_digest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_digest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_digest - Win32 Release"
-# Name "test_digest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_digest.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_hmac/test_hmac.dsp
^
|
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_hmac" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_hmac - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_hmac.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_hmac.mak" CFG="test_hmac - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_hmac - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_hmac - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_hmac - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_hmac - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_hmac - Win32 Release"
-# Name "test_hmac - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_hmac.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_input/test_input.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_input" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_input - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_input.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_input.mak" CFG="test_input - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_input - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_input - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_input - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_input - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_input - Win32 Release"
-# Name "test_input - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_input.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_output_mem.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_key_aes/test_key_aes.dsp
^
|
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_key_aes" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_key_aes - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_key_aes.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_key_aes.mak" CFG="test_key_aes - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_key_aes - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_key_aes - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_key_aes - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_key_aes - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_key_aes - Win32 Release"
-# Name "test_key_aes - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_key_aes.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_key_des/test_key_des.dsp
^
|
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_key_des" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_key_des - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_key_des.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_key_des.mak" CFG="test_key_des - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_key_des - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_key_des - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_key_des - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_key_des - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_key_des - Win32 Release"
-# Name "test_key_des - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_key_des.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_key_rsa/test_key_rsa.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_key_rsa" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_key_rsa - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_key_rsa.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_key_rsa.mak" CFG="test_key_rsa - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_key_rsa - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_key_rsa - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_key_rsa - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../common" /I "../../../libfoil/include" /I "../../../libfoil/src" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_key_rsa - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../../libfoil/include" /I "../../../libfoil/src" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_key_rsa - Win32 Release"
-# Name "test_key_rsa - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_key_rsa.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_output/test_output.dsp
^
|
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_output" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_output - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_output.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_output.mak" CFG="test_output - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_output - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_output - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_output - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_output - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_output - Win32 Release"
-# Name "test_output - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_output.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoil/test_sign/test_sign.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_sign" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_sign - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_sign.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_sign.mak" CFG="test_sign - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_sign - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_sign - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_sign - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_sign - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../libfoil/include" /I "../../../libfoil/src" /I "../../common" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_sign - Win32 Release"
-# Name "test_sign - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_sign.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/test/libfoilmsg/test_foilmsg/test_foilmsg.dsp
^
|
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_foilmsg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_foilmsg - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_foilmsg.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_foilmsg.mak" CFG="test_foilmsg - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_foilmsg - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_foilmsg - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_foilmsg - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../common" /I "../../../libfoilmsg/include" /I "../../../libfoilmsg/src" /I "../../../libfoil/include" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_foilmsg - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../../libfoilmsg/include" /I "../../../libfoilmsg/src" /I "../../../libfoil/include" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_foilmsg - Win32 Release"
-# Name "test_foilmsg - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_foilmsg.c
-# End Source File
-# End Group
-# Begin Group "Test Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\common\test_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_hexdump.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\test_main.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/tools/foil-tools.dsw
^
|
@@ -1,125 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "foilmsg"=.\foilmsg\foilmsg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libfoilmsg
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "foilpng"=.\foilpng\foilpng.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libfoil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libfoilmsg
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name png
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name zlib
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfoil"=..\libfoil\libfoil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libfoilmsg"=..\libfoilmsg\libfoilmsg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libglibutil"=$(LIBGLIBUTIL_DIR)\libglibutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "png"=$(LIBPNG_DIR)\png.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "zlib"=$(ZLIB_DIR)\zlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/tools/foilmsg/foilmsg.dsp
^
|
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foilmsg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=foilmsg - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "foilmsg.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "foilmsg.mak" CFG="foilmsg - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "foilmsg - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "foilmsg - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "foilmsg - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../libfoilmsg/include" /I "../../libfoil/include" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "foilmsg - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../libfoilmsg/include" /I "../../libfoil/include" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "foilmsg - Win32 Release"
-# Name "foilmsg - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\foilmsg.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/foil/tools/foilpng/foilpng.dsp
^
|
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="foilpng" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=foilpng - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "foilpng.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "foilpng.mak" CFG="foilpng - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "foilpng - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "foilpng - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "foilpng - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../libfoilmsg/include" /I "../../libfoil/include" /I "$(LIBPNG_DIR)" /I "$(ZLIB_DIR)" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "foilpng - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../libfoilmsg/include" /I "../../libfoil/include" /I "$(LIBPNG_DIR)" /I "$(ZLIB_DIR)" /I "$(LIBGLIBUTIL_DIR)/include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gio-2.0.lib libeay32.lib ssleay32.lib kernel32.lib user32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib" /libpath:"$(OPENSSL_ROOT)/lib"
-# SUBTRACT LINK32 /verbose
-
-!ENDIF
-
-# Begin Target
-
-# Name "foilpng - Win32 Release"
-# Name "foilpng - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\foilpng.c
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/libglibutil.dsp
^
|
@@ -1,174 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libglibutil" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libglibutil - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "libglibutil.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "libglibutil.mak" CFG="libglibutil - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "libglibutil - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libglibutil - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "libglibutil - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/Release"
-# PROP BASE Intermediate_Dir "build/Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/Release"
-# PROP Intermediate_Dir "build/Release"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF "$(CFG)" == "libglibutil - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/Debug"
-# PROP BASE Intermediate_Dir "build/Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/Debug"
-# PROP Intermediate_Dir "build/Debug"
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "libglibutil - Win32 Release"
-# Name "libglibutil - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\src\gutil_history.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_idlepool.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_idlequeue.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_intarray.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_ints.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_log.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_ring.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\gutil_strv.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\include\gutil_history.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_idlepool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_idlequeue.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_intarray.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_ints.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_log.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_ring.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_strv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\gutil_types.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/libglibutil_test.dsw
^
|
@@ -1,164 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libglibutil"=..\libglibutil.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "test_history"=.\test_history\test_history.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_idlepool"=.\test_idlepool\test_idlepool.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_idlequeue"=.\test_idlequeue\test_idlequeue.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_intarray"=.\test_intarray\test_intarray.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_ints"=.\test_ints\test_ints.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_log"=.\test_log\test_log.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_misc"=.\test_misc\test_misc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_ring"=.\test_ring\test_ring.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "test_strv"=.\test_strv\test_strv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libglibutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_history/test_history.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_history" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_history - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_history.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_history.mak" CFG="test_history - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_history - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_history - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_history - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_history - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_history - Win32 Release"
-# Name "test_history - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_history.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_idlepool/test_idlepool.dsp
^
|
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_idlepool" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_idlepool - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_idlepool.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_idlepool.mak" CFG="test_idlepool - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_idlepool - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_idlepool - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_idlepool - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_idlepool - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_idlepool - Win32 Release"
-# Name "test_idlepool - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_idlepool.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\test_object.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_idlequeue/test_idlequeue.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_idlequeue" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_idlequeue - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_idlequeue.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_idlequeue.mak" CFG="test_idlequeue - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_idlequeue - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_idlequeue - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_idlequeue - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winsqueue.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winsqueue.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_idlequeue - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winsqueue.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winsqueue.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_idlequeue - Win32 Release"
-# Name "test_idlequeue - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_idlequeue.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_intarray/test_intarray.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_intarray" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_intarray - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_intarray.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_intarray.mak" CFG="test_intarray - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_intarray - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_intarray - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_intarray - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_intarray - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_intarray - Win32 Release"
-# Name "test_intarray - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_intarray.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_ints/test_ints.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_ints" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_ints - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_ints.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_ints.mak" CFG="test_ints - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_ints - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_ints - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_ints - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_ints - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_ints - Win32 Release"
-# Name "test_ints - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_ints.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_log/test_log.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_log" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_log - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_log.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_log.mak" CFG="test_log - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_log - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_log - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_log - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_log - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_log - Win32 Release"
-# Name "test_log - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\test_log.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_misc/test_misc.dsp
^
|
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_misc" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_misc - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_misc.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_misc.mak" CFG="test_misc - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_misc - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_misc - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_misc - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_misc - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_misc - Win32 Release"
-# Name "test_misc - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\test_object.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_ring/test_ring.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_ring" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_ring - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_ring.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_ring.mak" CFG="test_ring - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_ring - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_ring - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_ring - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_ring - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_ring - Win32 Release"
-# Name "test_ring - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_ring.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-foilauth-1.1.6.tar.gz/libglibutil/test/test_strv/test_strv.dsp
^
|
@@ -1,106 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_strv" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=test_strv - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "test_strv.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "test_strv.mak" CFG="test_strv - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "test_strv - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "test_strv - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "test_strv - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "build/release"
-# PROP BASE Intermediate_Dir "build/release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "build/release"
-# PROP Intermediate_Dir "build/release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /machine:I386 /libpath:"$(GTK_ROOT)/lib"
-
-!ELSEIF "$(CFG)" == "test_strv - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "build/debug"
-# PROP BASE Intermediate_Dir "build/debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "build/debug"
-# PROP Intermediate_Dir "build/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../common" /I "$(GTK_ROOT)/include/glib-2.0" /I "$(GTK_ROOT)/lib/glib-2.0/include" /D "_DEBUG" /D "DEBUG" /D "WIN32" /D "_CONSOLE" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"$(GTK_ROOT)/lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "test_strv - Win32 Release"
-# Name "test_strv - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\test_main.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_strv.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\common\test_common.h
-# End Source File
-# End Group
-# End Target
-# End Project
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/app.pro
^
|
@@ -30,6 +30,10 @@
PKGCONFIG += libcrypto
}
+# Fix libfoil compilation warnings:
+DEFINES += GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32
+DEFINES += GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED
+
# Directories
FOIL_UI_REL = foil-ui
FOIL_UI_DIR = $${_PRO_FILE_PWD_}/$${FOIL_UI_REL}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/.gitignore
^
|
@@ -22,6 +22,10 @@
debian/libfoil.postrm.debhelper
debian/libfoil.substvars
debian/libfoil
+debian/libfoilmsg-dev.debhelper.log
+debian/libfoilmsg-dev.install
+debian/libfoilmsg-dev.substvars
+debian/libfoilmsg-dev
debian/tmp
debian/.debhelper
documentation.list
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/LICENSE
^
|
@@ -1,18 +1,18 @@
-Copyright (C) 2016-2022 by Slava Monich
+Copyright (C) 2016-2023 by Slava Monich <slava@monich.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
- 3. Neither the names of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ 3. Neither the names of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/Makefile
^
|
@@ -5,7 +5,10 @@
# This one could be substituted with arch specific dir
LIBDIR ?= /usr/lib
REL_LIBDIR := $(shell echo /$(LIBDIR) | sed -r 's|^/+||g')
-GEN_INSTALL_FILES := debian/libfoil.install debian/libfoil-dev.install
+GEN_INSTALL_FILES := \
+ debian/libfoil.install \
+ debian/libfoil-dev.install \
+ debian/libfoilmsg-dev.install
all:
%:
@@ -20,17 +23,21 @@
@make -C test clean
rm -fr test/coverage/results test/coverage/*.gcov
rm -f *~
- rm -fr $(BUILD_DIR) RPMS installroot
- rm -fr debian/tmp debian/libfoil debian/libfoil-dev
- rm -f documentation.list debian/files debian/*.substvars
- rm -f debian/*.debhelper.log debian/*.debhelper debian/*~
+ rm -fr $(BUILD_DIR) RPMS installroot documentation.list
+ rm -fr debian/tmp debian/.debhelper
+ rm -fr debian/foil-tools debian/libfoil
+ rm -fr debian/libfoil-dev debian/libfoilmsg-dev
+ rm -f debian/files debian/*.substvars debian/*~
+ rm -f debian/*.debhelper.log debian/*.debhelper
rm -f $(GEN_INSTALL_FILES)
pkgconfig:
make LIBDIR="$(LIBDIR)" -C libfoil pkgconfig
+ make LIBDIR="$(LIBDIR)" -C libfoilmsg pkgconfig
install: $(GEN_INSTALL_FILES)
make DESTDIR="$(DESTDIR)" LIBDIR="$(LIBDIR)" -C libfoil install-dev
+ make DESTDIR="$(DESTDIR)" LIBDIR="$(LIBDIR)" -C libfoilmsg install-dev
make DESTDIR="$(DESTDIR)" LIBDIR="$(LIBDIR)" -C tools install
debian/%.install: debian/%.install.in
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/README.md
^
|
@@ -0,0 +1,8 @@
+### libfoil
+
+Yet another glib-style crypto API with openssl backend.
+
+### libfoilmsg
+
+A library for encrypting, signing, decrypting and verifying
+standalone messages, built on top of the libfoil API.
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/debian/changelog
^
|
@@ -1,3 +1,12 @@
+libfoil (1.0.28) unstable; urgency=low
+
+ * Implemented support for AES CTR mode
+ * Support OpenSSH format of RSA private keys
+ * Added libfoilmsg development package
+ * Allow to choose the dictionary for Base64 input
+
+ -- Slava Monich <slava@monich.com> Mon, 01 May 2023 02:39:59 +0300
+
libfoil (1.0.27) unstable; urgency=low
* Reduced log level for non-critical warnings
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/debian/control
^
|
@@ -2,21 +2,27 @@
Section: libs
Priority: optional
Maintainer: Slava Monich <slava@monich.com>
-Build-Depends: debhelper (>= 7), libglibutil-dev (>= 1.0.54), libglib2.0-dev, libpng-dev, libmagic-dev, libssl-dev
+Build-Depends: debhelper (>= 7), libglibutil-dev (>= 1.0.54), libglib2.0-dev (>= 2.32), libpng-dev, libmagic-dev, libssl-dev
Standards-Version: 3.8.4
Package: libfoil
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libglibutil (>= 1.0.54)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libglibutil (>= 1.0.24)
Description: Library of glib-based cryptography utilities
Package: libfoil-dev
Section: libdevel
Architecture: any
-Depends: libfoil (= ${binary:Version}), ${misc:Depends}, libglibutil-dev (>= 1.0.54)
+Depends: libfoil (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev (>= 2.32), libglibutil-dev (>= 1.0.54)
Description: Development files for libfoil
+Package: libfoilmsg-dev
+Section: libdevel
+Architecture: any
+Depends: libfoil-dev, libglibutil-dev (>= 1.0.54)
+Description: Development files for libfoilmsg
+
Package: foil-tools
Section: misc
Architecture: any
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/debian/copyright
^
|
@@ -1,4 +1,4 @@
-Copyright (C) 2016-2022 by Slava Monich
+Copyright (C) 2016-2023 by Slava Monich
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/debian/libfoil-dev.install.in
^
|
@@ -1,3 +1,3 @@
debian/tmp/@LIBDIR@/libfoil.so @LIBDIR@
debian/tmp/@LIBDIR@/pkgconfig/libfoil.pc @LIBDIR@/pkgconfig
-debian/tmp/usr/include/* usr/include/
+debian/tmp/usr/include/foil usr/include/
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/debian/libfoilmsg-dev.install.in
^
|
@@ -0,0 +1,3 @@
+debian/tmp/@LIBDIR@/libfoilmsg.a @LIBDIR@
+debian/tmp/@LIBDIR@/pkgconfig/libfoilmsg.pc @LIBDIR@/pkgconfig
+debian/tmp/usr/include/foilmsg usr/include/
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/Makefile
^
|
@@ -90,6 +90,7 @@
SRC = \
foil_asn1.c \
+ foil_bcrypt.c \
foil_cipher.c \
foil_cipher_aes.c \
foil_cipher_sync.c \
@@ -111,6 +112,7 @@
foil_key.c \
foil_key_aes.c \
foil_key_des.c \
+ foil_key_rsa.c \
foil_key_rsa_private.c \
foil_key_rsa_public.c \
foil_output.c \
@@ -154,6 +156,8 @@
INCLUDES += -I$(INCLUDE_DIR) -I$(SRC_DIR)
BASE_FLAGS = -fPIC
FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
+ -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \
-MMD -MP $(shell pkg-config --cflags $(PKGS))
FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) \
$(shell pkg-config --libs $(PKGS))
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/include/foil_cipher.h
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2019 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -227,6 +227,8 @@
GType foil_impl_cipher_aes_cbc_decrypt_get_type(void);
GType foil_impl_cipher_aes_cfb_encrypt_get_type(void); /* Since 1.0.18 */
GType foil_impl_cipher_aes_cfb_decrypt_get_type(void); /* Since 1.0.18 */
+GType foil_impl_cipher_aes_ctr_encrypt_get_type(void); /* Since 1.0.28 */
+GType foil_impl_cipher_aes_ctr_decrypt_get_type(void); /* Since 1.0.28 */
GType foil_impl_cipher_aes_ecb_encrypt_get_type(void); /* Since 1.0.17 */
GType foil_impl_cipher_aes_ecb_decrypt_get_type(void); /* Since 1.0.17 */
GType foil_impl_cipher_des_cbc_encrypt_get_type(void); /* Since 1.0.16 */
@@ -238,6 +240,8 @@
#define FOIL_CIPHER_AES_CBC_DECRYPT foil_impl_cipher_aes_cbc_decrypt_get_type()
#define FOIL_CIPHER_AES_CFB_ENCRYPT foil_impl_cipher_aes_cfb_encrypt_get_type()
#define FOIL_CIPHER_AES_CFB_DECRYPT foil_impl_cipher_aes_cfb_decrypt_get_type()
+#define FOIL_CIPHER_AES_CTR_ENCRYPT foil_impl_cipher_aes_ctr_encrypt_get_type()
+#define FOIL_CIPHER_AES_CTR_DECRYPT foil_impl_cipher_aes_ctr_decrypt_get_type()
#define FOIL_CIPHER_AES_ECB_ENCRYPT foil_impl_cipher_aes_ecb_encrypt_get_type()
#define FOIL_CIPHER_AES_ECB_DECRYPT foil_impl_cipher_aes_ecb_decrypt_get_type()
#define FOIL_CIPHER_DES_CBC_ENCRYPT foil_impl_cipher_des_cbc_encrypt_get_type()
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/include/foil_input.h
^
|
@@ -1,16 +1,19 @@
/*
- * Copyright (C) 2016-2017 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1.Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2.Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -122,8 +125,17 @@
FoilInput* in,
guint flags);
+/*
+ * FOIL_INPUT_BASE64_STANDARD and FOIL_INPUT_BASE64_FILESAFE flags can
+ * be used to force the use of a specific dictionary table (referred to
+ * by RFC 4648 as "base64" and "base64url", respectively). If none or
+ * both of those flags are specified, the table is picked automatically
+ * based on the input, if only one flag is given, only that table is used.
+ */
#define FOIL_INPUT_BASE64_IGNORE_SPACES (0x01)
#define FOIL_INPUT_BASE64_VALIDATE (0x02) /* Since 1.0.1 */
+#define FOIL_INPUT_BASE64_STANDARD (0x04) /* Since 1.0.28 */
+#define FOIL_INPUT_BASE64_FILESAFE (0x08) /* Since 1.0.28 */
FoilInput*
foil_input_cipher_new(
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/include/foil_key.h
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -61,16 +61,21 @@
typedef enum foil_key_export_format {
FOIL_KEY_EXPORT_FORMAT_DEFAULT,
FOIL_KEY_EXPORT_FORMAT_RFC4716,
- FOIL_KEY_EXPORT_FORMAT_PKCS8 /* Since 1.0.7 */
+ FOIL_KEY_EXPORT_FORMAT_PKCS8, /* Since 1.0.7 */
+ FOIL_KEY_EXPORT_FORMAT_OPENSSH /* Since 1.0.28 */
} FoilKeyExportFormat;
/* Format of binary key data */
typedef enum foil_key_binary_format { /* Since 1.0.26 */
- FOIL_KEY_BINARY_FORMAT_DEFAULT, /* Valid for all key formats */
- FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1, /* RFC 3447 (Appendix A) */
- FOIL_KEY_BINARY_FORMAT_RSA_SSH /* RFC 4253 (ssh-rsa format) */
+ FOIL_KEY_BINARY_FORMAT_DEFAULT, /* Valid for all key types */
+ FOIL_KEY_BINARY_FORMAT_RSA_PKCS1, /* RFC 3447 (Appendix A) */
+ FOIL_KEY_BINARY_FORMAT_RSA_SSH, /* RFC 4253 (ssh-rsa format) */
+ FOIL_KEY_BINARY_FORMAT_OPENSSH /* Since 1.0.28 */
} FoilKeyBinaryFormat;
+/* Source-level compatibility with libfoil <= 1.0.27 */
+#define FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1 FOIL_KEY_BINARY_FORMAT_RSA_PKCS1
+
FoilKey*
foil_key_new_from_data(
GType type,
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/include/foil_output.h
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -141,7 +139,7 @@
guint linebreak);
#define FOIL_OUTPUT_BASE64_CLOSE (0x01) /* Close the target stream */
-#define FOIL_OUTPUT_BASE64_FILESAFE (0x02) /* Use filename safe enciding */
+#define FOIL_OUTPUT_BASE64_FILESAFE (0x02) /* Use filename safe encoding */
FoilOutput*
foil_output_file_new(
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/include/foil_version.h
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2022-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -35,13 +33,16 @@
#ifndef FOIL_VERSION_H
#define FOIL_VERSION_H
+#include <glib.h>
+
+G_BEGIN_DECLS
+
/*
* This header first appeared in version 1.0.24 therefore version checks
* in the code which is supposed to be compilable against earlier versions
* of libfoil should look like this:
*
- * #if defined(FOIL_CORE_VERSION) && \
- * FOIL_CORE_VERSION > FOIL_VERSION_WORD(1,0,24)
+ * #if defined(FOIL_VERSION) && FOIL_VERSION > FOIL_VERSION_WORD(1,0,24)
* ...
* #endif
*
@@ -58,8 +59,8 @@
#define FOIL_VERSION_MAJOR 1
#define FOIL_VERSION_MINOR 0
-#define FOIL_VERSION_RELEASE 27
-#define FOIL_VERSION_STRING "1.0.27"
+#define FOIL_VERSION_RELEASE 28
+#define FOIL_VERSION_STRING "1.0.28"
/* Version as a single word */
#define FOIL_VERSION_WORD(v1,v2,v3) \
@@ -73,7 +74,7 @@
/*
* Function for run-time version detection in case if you're linking
- * against a dynamic library.
+ * against the dynamic library.
*/
unsigned int
foil_version(
@@ -88,6 +89,9 @@
#define FOIL_VERSION_1_0_25 FOIL_VERSION_WORD(1,0,25)
#define FOIL_VERSION_1_0_26 FOIL_VERSION_WORD(1,0,26)
#define FOIL_VERSION_1_0_27 FOIL_VERSION_WORD(1,0,27)
+#define FOIL_VERSION_1_0_28 FOIL_VERSION_WORD(1,0,28)
+
+G_END_DECLS
#endif /* FOIL_VERSION_H */
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_bcrypt.c
^
|
@@ -0,0 +1,686 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#include "foil_bcrypt.h"
+#include "foil_digest.h"
+
+/*
+ * Blowfish block cipher for OpenBSD
+ * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * All rights reserved.
+ *
+ * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This code is derived from section 14.3 and the given source
+ * in section V of Applied Cryptography, second edition.
+ * Blowfish is an unpatented fast block cipher designed by
+ * Bruce Schneier.
+ */
+
+#include "foil_bcrypt.h"
+
+#define BLF_N 16 /* Number of Subkeys */
+#define BLF_MAXKEYLEN ((BLF_N-2)*4) /* 448 bits */
+#define BLF_MAXUTILIZED ((BLF_N+2)*4) /* 576 bits */
+
+/* Blowfish context */
+typedef struct BlowfishContext {
+ guint32 S[4][256]; /* S-Boxes */
+ guint32 P[BLF_N + 2]; /* Subkeys */
+} blf_ctx;
+
+/* Function for Feistel Networks */
+
+#define F(s,x) ((((s)[ (((x)>>24)&0xFF)] \
+ + (s)[0x100 + (((x)>>16)&0xFF)]) \
+ ^ (s)[0x200 + (((x)>> 8)&0xFF)]) \
+ + (s)[0x300 + ( (x) &0xFF)])
+
+#define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n])
+
+static
+void
+Blowfish_encipher(
+ blf_ctx* c,
+ guint32* xl,
+ guint32* xr)
+{
+ guint32 Xl;
+ guint32 Xr;
+ guint32* s = c->S[0];
+ guint32* p = c->P;
+
+ Xl = *xl;
+ Xr = *xr;
+
+ Xl ^= p[0];
+ BLFRND(s, p, Xr, Xl, 1); BLFRND(s, p, Xl, Xr, 2);
+ BLFRND(s, p, Xr, Xl, 3); BLFRND(s, p, Xl, Xr, 4);
+ BLFRND(s, p, Xr, Xl, 5); BLFRND(s, p, Xl, Xr, 6);
+ BLFRND(s, p, Xr, Xl, 7); BLFRND(s, p, Xl, Xr, 8);
+ BLFRND(s, p, Xr, Xl, 9); BLFRND(s, p, Xl, Xr, 10);
+ BLFRND(s, p, Xr, Xl, 11); BLFRND(s, p, Xl, Xr, 12);
+ BLFRND(s, p, Xr, Xl, 13); BLFRND(s, p, Xl, Xr, 14);
+ BLFRND(s, p, Xr, Xl, 15); BLFRND(s, p, Xl, Xr, 16);
+
+ *xl = Xr ^ p[17];
+ *xr = Xl;
+}
+
+static
+void
+Blowfish_initstate(
+ blf_ctx* c)
+{
+ /* P-box and S-box tables initialized with digits of Pi */
+ static const blf_ctx initstate = {
+ {
+ {
+ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+ 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+ 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+ 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+ 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+ 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+ 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+ 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+ 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+ 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+ 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+ 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+ 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+ 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+ 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+ 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+ 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+ 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+ 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+ 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+ 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+ 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+ 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+ 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+ 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+ 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+ 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+ 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+ 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+ 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+ 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+ 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+ 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+ }, {
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_bcrypt.h
^
|
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef FOIL_BCRYPT_H
+#define FOIL_BCRYPT_H
+
+#include "foil_types_p.h"
+
+GBytes*
+foil_bcrypt_pbkdf(
+ const char* pass,
+ const FoilBytes* salt,
+ gsize keylen,
+ guint rounds)
+ FOIL_INTERNAL;
+
+#endif /* FOIL_BCRYPT_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_cipher_p.h
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 by Slava Monich
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -70,7 +70,7 @@
int output_block_size;
};
-GType foil_cipher_get_type(void);
+GType foil_cipher_get_type(void) FOIL_INTERNAL;
#define FOIL_TYPE_CIPHER (foil_cipher_get_type())
#define FOIL_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST(obj, \
FOIL_TYPE_CIPHER, FoilCipher))
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_input_base64.c
^
|
@@ -1,16 +1,19 @@
/*
- * Copyright (C) 2016-2021 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1.Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2.Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -45,43 +48,47 @@
GByteArray* skip_buf;
} FoilInputBase64;
-/* We allow any encoding scheme but not a mix of those */
-static const guint8 foil_input_base64_default_map[128] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF, 0xFF, 0x3F,
+/*
+ * We allow any encoding scheme but not a mix of those. They are referred to
+ * by RFC 4648 as "base64" and "base64url", respectively,
+ */
+#define NONE 0xff
+static const guint8 foil_input_base64_table[128] = {
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, 0x3E, NONE, NONE, NONE, 0x3F,
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
- 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
- 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+ 0x3C, 0x3D, NONE, NONE, NONE, 0x00, NONE, NONE,
+ NONE, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
- 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
+ 0x17, 0x18, 0x19, NONE, NONE, NONE, NONE, NONE,
+ NONE, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
- 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+ 0x31, 0x32, 0x33, NONE, NONE, NONE, NONE, NONE
};
-static const guint8 foil_input_base64_filename_map[128] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xFF,
+static const guint8 foil_input_base64url_table[128] = {
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE,
+ NONE, NONE, NONE, NONE, NONE, 0x3E, NONE, NONE,
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
- 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
- 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+ 0x3C, 0x3D, NONE, NONE, NONE, 0x00, NONE, NONE,
+ NONE, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
- 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F,
- 0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
+ 0x17, 0x18, 0x19, NONE, NONE, NONE, NONE, 0x3F,
+ NONE, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
- 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+ 0x31, 0x32, 0x33, NONE, NONE, NONE, NONE, NONE
};
static
@@ -110,28 +117,28 @@
{
const guint8 c = *ptr;
if ((c & 0x7f) == c) {
- guint8 mapped = 0xff;
+ guint8 mapped = NONE;
if (self->map) {
/* Have already chosen the map */
mapped = self->map[c];
} else {
- const guint8* map = foil_input_base64_default_map;
- if (map[c] == 0xff) {
- map = foil_input_base64_filename_map;
- if (map[c] != 0xff) {
+ const guint8* map = foil_input_base64_table;
+ if (map[c] == NONE) {
+ map = foil_input_base64url_table;
+ if (map[c] != NONE) {
/* Stick with the filename safe map */
mapped = map[c];
self->map = map;
}
} else {
- if (foil_input_base64_filename_map[c] == 0xff) {
+ if (foil_input_base64url_table[c] == NONE) {
/* Stick with the standard map */
self->map = map;
}
mapped = map[c];
}
}
- if (mapped != 0xff) {
+ if (mapped != NONE) {
*ptr = mapped;
return TRUE;
}
@@ -254,7 +261,7 @@
int k = 0;
/* Copy already decoded bytes */
- if (self->buffered && remain) {
+ if (self->buffered) {
gsize n = MIN(remain, self->buffered);
if (ptr) {
gsize off = BASE64_DECODE_OUTPUT_CHUNK - self->buffered;
@@ -285,6 +292,7 @@
case 2:
self->buffered++;
self->buf[--off] = ((chunk[0]<<2)&0xFC) | ((chunk[1]>>4)&0x03);
+ break;
}
n = MIN(remain, self->buffered);
remain -= n;
@@ -345,7 +353,15 @@
if (G_LIKELY(in)) {
FoilInputBase64* self = g_slice_new0(FoilInputBase64);
self->in = foil_input_ref(in);
- self->flags = flags;
+ switch ((self->flags = flags) &
+ (FOIL_INPUT_BASE64_STANDARD | FOIL_INPUT_BASE64_FILESAFE)) {
+ case FOIL_INPUT_BASE64_STANDARD:
+ self->map = foil_input_base64_table;
+ break;
+ case FOIL_INPUT_BASE64_FILESAFE:
+ self->map = foil_input_base64url_table;
+ break;
+ }
return foil_input_init(&self->parent, &foil_input_base64_fn);
}
return NULL;
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -366,7 +364,7 @@
}
g_string_append_c(buf, c);
} else if (!isspace(c)) {
- /* We are only expecting spaces and gex characters */
+ /* We are only expecting spaces and hex characters */
break;
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_aes.c
^
|
@@ -1,39 +1,35 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
* any official policies, either expressed or implied.
*/
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
-
#include "foil_key_aes.h"
#include "foil_random.h"
#include "foil_input.h"
@@ -231,7 +227,8 @@
case FOIL_KEY_BINARY_FORMAT_DEFAULT:
return foil_key_aes_default_bytes(FOIL_KEY_AES_(key));
case FOIL_KEY_BINARY_FORMAT_RSA_SSH:
- case FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1:
+ case FOIL_KEY_BINARY_FORMAT_RSA_PKCS1:
+ case FOIL_KEY_BINARY_FORMAT_OPENSSH:
break;
}
/* Invalid/unsupported format */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_des.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -304,7 +304,8 @@
case FOIL_KEY_BINARY_FORMAT_DEFAULT:
return foil_key_des_default_bytes(FOIL_KEY_DES_(key));
case FOIL_KEY_BINARY_FORMAT_RSA_SSH:
- case FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1:
+ case FOIL_KEY_BINARY_FORMAT_RSA_PKCS1:
+ case FOIL_KEY_BINARY_FORMAT_OPENSSH:
break;
}
/* Invalid/unsupported format */
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_rsa.c
^
|
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#include "foil_input.h"
+#include "foil_key_rsa.h"
+#include "foil_key_rsa_public.h"
+#include "foil_output.h"
+#include "foil_pool.h"
+#include "foil_util_p.h"
+
+#include <ctype.h>
+
+static const guint8 openssh_key_prefix_data[] = {
+ '-','-','-','-','-','B','E','G','I','N',' ','O','P','E','N','S',
+ 'S','H',' ','P','R','I','V','A','T','E',' ','K','E','Y','-','-',
+ '-','-','-'
+};
+static const guint8 openssh_key_suffix_data[] = {
+ '-','-','-','-','-','E','N','D',' ','O','P','E','N','S','S','H',
+ ' ','P','R','I','V','A','T','E',' ','K','E','Y','-','-','-','-',
+ '-'
+};
+
+static const guint8 openssh_key_auth_magic_data[] = {
+ 'o','p','e','n','s','s','h','-','k','e','y','-','v','1',0
+};
+
+static const guint8 ssh_rsa_mark_data[] = {
+ 's','s','h','-','r','s','a'
+};
+
+const FoilBytes foil_key_openssh_text_prefix = {
+ FOIL_ARRAY_AND_SIZE(openssh_key_prefix_data)
+};
+
+const FoilBytes foil_key_openssh_text_suffix = {
+ FOIL_ARRAY_AND_SIZE(openssh_key_suffix_data)
+};
+
+const FoilBytes foil_key_openssh_auth_magic = {
+ FOIL_ARRAY_AND_SIZE(openssh_key_auth_magic_data)
+};
+
+const FoilBytes foil_ssh_rsa_mark = {
+ FOIL_ARRAY_AND_SIZE(ssh_rsa_mark_data)
+};
+
+#define FROM_BE32(ptr) \
+ ((((((((ptr)[0]) << 8) + \
+ (ptr)[1]) << 8) + \
+ (ptr)[2]) << 8) + \
+ (ptr)[3])
+
+gboolean
+foil_key_rsa_parse_n(
+ GUtilRange* pos,
+ guint32* n)
+{
+ if ((pos->ptr + 4) <= pos->end) {
+ *n = FROM_BE32(pos->ptr);
+ pos->ptr += 4;
+ return TRUE;
+ }
+ return FALSE;
+}
+
+gboolean
+foil_key_rsa_parse_n_bytes(
+ GUtilRange* pos,
+ FoilBytes* data)
+{
+ if ((pos->ptr + 4) <= pos->end) {
+ const guint32 len = FROM_BE32(pos->ptr);
+ if ((pos->ptr + 4 + len) <= pos->end) {
+ data->val = pos->ptr + 4;
+ data->len = len;
+ pos->ptr = data->val + len;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+gboolean
+foil_key_rsa_write_n(
+ FoilOutput* out,
+ guint32 n)
+{
+ guint8 bytes[4];
+
+ bytes[0] = (guint8)(n >> 24);
+ bytes[1] = (guint8)(n >> 16);
+ bytes[2] = (guint8)(n >> 8);
+ bytes[3] = (guint8)n;
+ return foil_output_write(out, bytes, sizeof(bytes));
+}
+
+gboolean
+foil_key_rsa_write_n_bytes(
+ FoilOutput* out,
+ const FoilBytes* data)
+{
+ return foil_key_rsa_write_n(out, data->len) &&
+ foil_output_write_all(out, data->val, data->len);
+}
+
+gboolean
+foil_key_rsa_parse_openssh_text(
+ const FoilBytes* data,
+ FoilKeyRsaPublicData* pub,
+ FoilKeyRsaOpensshPrivData* priv,
+ FoilPool* pool)
+{
+ gboolean ok = FALSE;
+ GUtilRange pos;
+ foil_parse_init_data(&pos, data);
+ foil_parse_skip_spaces(&pos);
+ if (foil_parse_skip_bytes(&pos, &foil_key_openssh_text_prefix) &&
+ pos.ptr < pos.end && isspace(*pos.ptr)) {
+ GBytes* decoded = foil_parse_base64(&pos,
+ FOIL_INPUT_BASE64_IGNORE_SPACES |
+ FOIL_INPUT_BASE64_STANDARD);
+ if (decoded) {
+ if (foil_parse_skip_bytes(&pos, &foil_key_openssh_text_suffix)) {
+ FoilBytes b;
+ if (foil_key_rsa_parse_openssh_binary
+ (foil_bytes_from_data(&b, decoded), pub, priv)) {
+ /* Preserve GBytes in the pool to keep pointers valid */
+ foil_pool_add_bytes_ref(pool, decoded);
+ ok = TRUE;
+ }
+ }
+ g_bytes_unref(decoded);
+ }
+ }
+ return ok;
+}
+
+gboolean
+foil_key_rsa_parse_openssh_binary(
+ const FoilBytes* data,
+ FoilKeyRsaPublicData* pub,
+ FoilKeyRsaOpensshPrivData* priv)
+{
+ guint32 nkeys;
+ GUtilRange pos;
+ FoilBytes pubkey;
+ foil_parse_init_data(&pos, data);
+ return foil_parse_skip_bytes(&pos, &foil_key_openssh_auth_magic) &&
+ foil_key_rsa_parse_n_bytes(&pos, &priv->ciphername) &&
+ foil_key_rsa_parse_n_bytes(&pos, &priv->kdfname) &&
+ foil_key_rsa_parse_n_bytes(&pos, &priv->kdf) &&
+ foil_key_rsa_parse_n(&pos, &nkeys) && nkeys == 1 &&
+ foil_key_rsa_parse_n_bytes(&pos, &pubkey) &&
+ foil_key_rsa_public_parse_ssh_rsa_binary(pub, &pubkey) &&
+ foil_key_rsa_parse_n_bytes(&pos, &priv->data) &&
+ pos.ptr == pos.end;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_rsa.h
^
|
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
+ */
+
+#ifndef FOIL_KEY_RSA_H
+#define FOIL_KEY_RSA_H
+
+#include "foil_types_p.h"
+
+typedef struct foil_key_rsa_public_data {
+ FoilBytes n;
+ FoilBytes e;
+} FoilKeyRsaPublicData;
+
+typedef struct foil_key_rsa_openssh_priv_data {
+ FoilBytes ciphername;
+ FoilBytes kdfname;
+ FoilBytes kdf;
+ FoilBytes data;
+} FoilKeyRsaOpensshPrivData;
+
+extern const FoilBytes foil_key_openssh_text_prefix FOIL_INTERNAL;
+extern const FoilBytes foil_key_openssh_text_suffix FOIL_INTERNAL;
+extern const FoilBytes foil_key_openssh_auth_magic FOIL_INTERNAL;
+extern const FoilBytes foil_ssh_rsa_mark FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_parse_n(
+ GUtilRange* pos,
+ guint32* n)
+ FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_parse_n_bytes(
+ GUtilRange* pos,
+ FoilBytes* bytes)
+ FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_write_n(
+ FoilOutput* out,
+ guint32 n)
+ FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_write_n_bytes(
+ FoilOutput* out,
+ const FoilBytes* data)
+ FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_parse_openssh_text(
+ const FoilBytes* data,
+ FoilKeyRsaPublicData* pub,
+ FoilKeyRsaOpensshPrivData* priv,
+ FoilPool* pool)
+ FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_parse_openssh_binary(
+ const FoilBytes* data,
+ FoilKeyRsaPublicData* pub,
+ FoilKeyRsaOpensshPrivData* priv)
+ FOIL_INTERNAL;
+
+#endif /* FOIL_KEY_RSA_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_rsa_private.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -46,6 +44,7 @@
#include "foil_util_p.h"
#include "foil_asn1.h"
#include "foil_oid.h"
+#include "foil_bcrypt.h"
#include <gutil_strv.h>
#include <gutil_misc.h>
@@ -54,6 +53,15 @@
#define GLOG_MODULE_NAME foil_log_key
#include "foil_log_p.h"
+typedef struct foil_key_rsa_openssh_cipher {
+ const char* name;
+ guint blocklen;
+ guint keysize; /* key_len + iv */
+ GType (*key)(void);
+ GType (*encrypt)(void);
+ GType (*decrypt)(void);
+} FoilKeyRsaOpensshCipher;
+
G_DEFINE_ABSTRACT_TYPE(FoilKeyRsaPrivate, foil_key_rsa_private,
FOIL_TYPE_PRIVATE_KEY);
#define FOIL_KEY_RSA_PRIVATE_CAST_TO_KEY(obj) &((obj)->super.super)
@@ -61,43 +69,75 @@
#define FOIL_KEY_RSA_PRIVATE_CLEAR_BYTES(bytes) \
memset((void*)((bytes)->val), 0, (bytes)->len);
-#define FOIL_PKCS5_SALT_LEN (8)
-G_STATIC_ASSERT(FOIL_AES_BLOCK_SIZE >= FOIL_PKCS5_SALT_LEN);
+#define foil_key_rsa_private_write_data(out,data) \
+ foil_output_write(out, (data)->val, (data)->len)
+#define foil_key_rsa_private_write_all(out,data) \
+ foil_output_write_all(out, (data)->val, (data)->len)
+
+#define OPENSSH_PLAINTEXT_ALIGN (8)
+#define OPENSSH_SALT_LEN (16)
+#define OPENSSH_ROUNDS (8)
+
+#define FOIL_PKCS1_SALT_LEN (8)
+G_STATIC_ASSERT(FOIL_AES_BLOCK_SIZE >= FOIL_PKCS1_SALT_LEN);
-static const guint8 rsa_private_key_pkcs5_prefix[] = {
+static const guint8 rsa_private_key_pkcs1_prefix_data[] = {
'-','-','-','-','-','B','E','G','I','N',' ','R','S','A',' ','P',
'R','I','V','A','T','E',' ','K','E','Y','-','-','-','-','-'
};
-static const guint8 rsa_private_key_pkcs5_suffix[] = {
+static const guint8 rsa_private_key_pkcs1_suffix_data[] = {
'-','-','-','-','-','E','N','D',' ','R','S','A',' ','P','R','I',
'V','A','T','E',' ','K','E','Y','-','-','-','-','-'
};
-static const FoilBytes rsa_private_key_pkcs5_prefix_bytes = {
- rsa_private_key_pkcs5_prefix,
- G_N_ELEMENTS(rsa_private_key_pkcs5_prefix)
+static const FoilBytes rsa_private_key_pkcs1_prefix = {
+ FOIL_ARRAY_AND_SIZE(rsa_private_key_pkcs1_prefix_data)
};
-static const FoilBytes rsa_private_key_pkcs5_suffix_bytes = {
- rsa_private_key_pkcs5_suffix,
- G_N_ELEMENTS(rsa_private_key_pkcs5_suffix)
+static const FoilBytes rsa_private_key_pkcs1_suffix = {
+ FOIL_ARRAY_AND_SIZE(rsa_private_key_pkcs1_suffix_data)
};
-static const guint8 rsa_private_key_pkcs8_prefix[] = {
+static const guint8 rsa_private_key_pkcs8_prefix_data[] = {
'-','-','-','-','-','B','E','G','I','N',' ','E','N','C','R','Y',
'P','T','E','D',' ','P','R','I','V','A','T','E',' ','K','E','Y',
'-','-','-','-','-'
};
-static const guint8 rsa_private_key_pkcs8_suffix[] = {
+static const guint8 rsa_private_key_pkcs8_suffix_data[] = {
'-','-','-','-','-','E','N','D',' ','E','N','C','R','Y','P','T',
'E','D',' ','P','R','I','V','A','T','E',' ','K','E','Y','-','-',
'-','-','-'
};
-static const FoilBytes rsa_private_key_pkcs8_prefix_bytes = {
- rsa_private_key_pkcs8_prefix,
- G_N_ELEMENTS(rsa_private_key_pkcs8_prefix)
-};
-static const FoilBytes rsa_private_key_pkcs8_suffix_bytes = {
- rsa_private_key_pkcs8_suffix,
- G_N_ELEMENTS(rsa_private_key_pkcs8_suffix)
+
+static const FoilBytes rsa_private_key_pkcs8_prefix = {
+ FOIL_ARRAY_AND_SIZE(rsa_private_key_pkcs8_prefix_data)
+};
+static const FoilBytes rsa_private_key_pkcs8_suffix = {
+ FOIL_ARRAY_AND_SIZE(rsa_private_key_pkcs8_suffix_data)
+};
+
+static const guint8 openssh_bcrypt_data[] = { 'b','c','r','y','p','t' };
+static const FoilBytes openssh_bcrypt = {
+ FOIL_ARRAY_AND_SIZE(openssh_bcrypt_data)
+};
+
+static const guint8 openssh_none_data[] = {'n','o','n','e' };
+static const FoilBytes openssh_none = {
+ FOIL_ARRAY_AND_SIZE(openssh_none_data)
+};
+
+#define OPENSSH_DEFAULT_CIPHER (openssh_ciphers + 5) /* aes256-ctr */
+static const FoilKeyRsaOpensshCipher openssh_ciphers[] = {
+ #define OPENSSH_CIPHER_AES(bits,mode) { \
+ "aes" #bits "-" #mode, FOIL_AES_BLOCK_SIZE, \
+ (bits)/8 + FOIL_AES_BLOCK_SIZE, foil_key_aes##bits##_get_type, \
+ foil_impl_cipher_aes_##mode##_encrypt_get_type, \
+ foil_impl_cipher_aes_##mode##_decrypt_get_type }
+ OPENSSH_CIPHER_AES(128,cbc),
+ OPENSSH_CIPHER_AES(192,cbc),
+ OPENSSH_CIPHER_AES(256,cbc),
+ OPENSSH_CIPHER_AES(128,ctr),
+ OPENSSH_CIPHER_AES(192,ctr),
+ OPENSSH_CIPHER_AES(256,ctr)
+ #undef OPENSSH_CIPHER_AES
};
void
@@ -115,10 +155,10 @@
const FoilKeyRsaPrivateData* data)
{
const gsize total = FOIL_ALIGN(sizeof(*data)) +
- FOIL_ALIGN(data->n.len) + FOIL_ALIGN(data->e.len) +
- FOIL_ALIGN(data->d.len) + FOIL_ALIGN(data->p.len) +
- FOIL_ALIGN(data->q.len) + FOIL_ALIGN(data->dmp1.len) +
- FOIL_ALIGN(data->dmq1.len) + FOIL_ALIGN(data->iqmp.len);
+ FOIL_ALIGN(data->n.len) + FOIL_ALIGN(data->e.len) +
+ FOIL_ALIGN(data->d.len) + FOIL_ALIGN(data->p.len) +
+ FOIL_ALIGN(data->q.len) + FOIL_ALIGN(data->dmp1.len) +
+ FOIL_ALIGN(data->dmq1.len) + FOIL_ALIGN(data->iqmp.len);
FoilKeyRsaPrivateData* copy = g_malloc(total);
guint8* ptr = ((guint8*)copy) + FOIL_ALIGN(sizeof(*copy));
ptr = foil_bytes_copy(©->n, &data->n, ptr);
@@ -192,10 +232,126 @@
static
GBytes*
-foil_key_rsa_private_bytes_pkcs1(
- FoilKeyRsaPrivate* self)
+foil_key_rsa_private_data_to_openssh_private(
+ const FoilKeyRsaPrivateData* priv,
+ guint align,
+ const char* comment)
+{
+ FoilOutput* out = foil_output_mem_new(NULL);
+ FoilBytes c;
+ guint32 check;
+ guint8 pad;
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_rsa_private.h
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -36,6 +34,7 @@
#define FOIL_KEY_RSA_PRIVATE_H
#include "foil_private_key_p.h"
+#include "foil_key_rsa.h"
/*
* RSAPrivateKey ::= SEQUENCE {
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_rsa_public.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -61,43 +59,48 @@
#define FOIL_KEY_RSA_PUBLIC_HAS_PREFIX(data,len,prefix) ( \
(guint)(len) >= G_N_ELEMENTS(prefix) && \
memcmp(data, prefix, G_N_ELEMENTS(prefix)) == 0)
-#define FOIL_KEY_RSA_PUBLIC_HAS_TEXT_PREFIX(data,prefix) ( \
- FOIL_KEY_RSA_PUBLIC_HAS_PREFIX((data)->val,(data)->len,prefix) && \
- ((guint)((data)->len) == G_N_ELEMENTS(prefix) || \
- isspace((data)->val[G_N_ELEMENTS(prefix)])))
+#define foil_key_rsa_public_write_all(out, data) \
+ foil_output_write_all(out, (data)->val, (data)->len)
-/*
- * string "ssh-rsa"
- * mpint e
- * mpint n
- */
-static const guint8 rsa_public_binary_prefix[] = {
- 0x00,0x00,0x00,0x07,'s','s','h','-','r','s','a'
-};
-/* First 84 bits of the above, BASE-64 encoded */
+/* First 84 bits of binary ssh-rsa prefix, BASE-64 encoded */
static const guint8 rsa_public_base64_prefix[] = {
'A','A','A','A','B','3','N','z','a','C','1','y','c','2'
};
/* Text formats */
-static const guint8 ssh_rsa_text_prefix[] = {
+static const guint8 ssh_rsa_text_prefix_data[] = {
's','s','h','-','r','s','a'
};
-static const guint8 rsa_public_rfc4716_prefix[] = {
+static const guint8 rsa_public_rfc4716_prefix_data[] = {
'-','-','-','-',' ','B','E','G','I','N',' ','S','S','H','2',' ',
'P','U','B','L','I','C',' ','K','E','Y',' ','-','-','-','-'
};
-static const guint8 rsa_public_rfc4716_suffix[] = {
+static const guint8 rsa_public_rfc4716_suffix_data[] = {
'-','-','-','-',' ','E','N','D',' ','S','S','H','2',' ','P','U',
'B','L','I','C',' ','K','E','Y',' ','-','-','-','-'
};
-static const guint8 rsa_public_pkcs8_prefix[] = {
+static const guint8 rsa_public_pkcs8_prefix_data[] = {
'-','-','-','-','-','B','E','G','I','N',' ','P','U','B','L','I',
'C',' ','K','E','Y','-','-','-','-','-'
};
-static const guint8 rsa_public_pkcs8_suffix[] = {
+static const guint8 rsa_public_pkcs8_suffix_data[] = {
'-','-','-','-','-','E','N','D',' ','P','U','B','L','I','C',' ',
'K','E','Y','-','-','-','-','-'
};
+static const FoilBytes ssh_rsa_text_prefix = {
+ FOIL_ARRAY_AND_SIZE(ssh_rsa_text_prefix_data)
+};
+static const FoilBytes rsa_public_rfc4716_prefix = {
+ FOIL_ARRAY_AND_SIZE(rsa_public_rfc4716_prefix_data)
+};
+static const FoilBytes rsa_public_rfc4716_suffix = {
+ FOIL_ARRAY_AND_SIZE(rsa_public_rfc4716_suffix_data)
+};
+static const FoilBytes rsa_public_pkcs8_prefix = {
+ FOIL_ARRAY_AND_SIZE(rsa_public_pkcs8_prefix_data)
+};
+static const FoilBytes rsa_public_pkcs8_suffix = {
+ FOIL_ARRAY_AND_SIZE(rsa_public_pkcs8_suffix_data)
+};
static
FoilKeyRsaPublicData*
@@ -131,23 +134,6 @@
}
}
-static
-gboolean
-foil_key_rsa_public_parse_len(
- GUtilRange* pos,
- guint32* len)
-{
- if ((pos->ptr + 4) <= pos->end) {
- *len = ((((((pos->ptr[0]) << 8) +
- pos->ptr[1]) << 8) +
- pos->ptr[2]) << 8) +
- pos->ptr[3];
- pos->ptr += 4;
- return TRUE;
- }
- return FALSE;
-}
-
void
foil_key_rsa_public_set_data(
FoilKeyRsaPublic* self,
@@ -157,67 +143,55 @@
self->data = foil_key_rsa_public_data_copy(key_data);
}
-static
-void
-foil_key_rsa_public_append_bytes(
- GByteArray* buf,
- const FoilBytes* bytes)
+gboolean
+foil_key_rsa_public_data_write_ssh_rsa(
+ FoilOutput* out,
+ const FoilKeyRsaPublicData* data)
{
- guint8 len[4];
- len[0] = (guint8)(bytes->len >> 24);
- len[1] = (guint8)(bytes->len >> 16);
- len[2] = (guint8)(bytes->len >> 8);
- len[3] = (guint8)(bytes->len);
- g_byte_array_append(buf, len, sizeof(len));
- g_byte_array_append(buf, bytes->val, bytes->len);
+ /*
+ * string "ssh-rsa"
+ * mpint e
+ * mpint n
+ */
+ return foil_key_rsa_write_n_bytes(out, &foil_ssh_rsa_mark) &&
+ foil_key_rsa_write_n_bytes(out, &data->e) &&
+ foil_key_rsa_write_n_bytes(out, &data->n);
}
-static
GBytes*
-foil_key_rsa_public_data_ssh_rsa(
+foil_key_rsa_public_data_ssh_rsa_bytes(
const FoilKeyRsaPublicData* data)
{
GBytes* bytes = NULL;
if (data) {
- GByteArray* buf = g_byte_array_sized_new(
- G_N_ELEMENTS(rsa_public_binary_prefix) + 8 +
+ GByteArray* buf = g_byte_array_sized_new(12 + foil_ssh_rsa_mark.len +
data->e.len + data->n.len);
- g_byte_array_append(buf, rsa_public_binary_prefix,
- G_N_ELEMENTS(rsa_public_binary_prefix));
- foil_key_rsa_public_append_bytes(buf, &data->e);
- foil_key_rsa_public_append_bytes(buf, &data->n);
- bytes = g_byte_array_free_to_bytes(buf);
+ FoilOutput* out = foil_output_mem_new(buf);
+ foil_key_rsa_public_data_write_ssh_rsa(out, data);
+ bytes = foil_output_free_to_bytes(out);
+ g_byte_array_unref(buf);
}
return bytes;
}
-static
gboolean
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_key_rsa_public.h
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2019 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -36,11 +34,7 @@
#define FOIL_KEY_RSA_PUBLIC_H
#include "foil_key_p.h"
-
-struct foil_key_rsa_public_data {
- FoilBytes n;
- FoilBytes e;
-};
+#include "foil_key_rsa.h"
typedef struct foil_key_rsa_public {
FoilKey key;
@@ -60,12 +54,31 @@
#define FOIL_IS_RSA_PUBLIC_KEY(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
FOIL_TYPE_KEY_RSA_PUBLIC)
+extern const FoilBytes foil_rsa_public_binary_prefix FOIL_INTERNAL;
+
void
foil_key_rsa_public_set_data(
FoilKeyRsaPublic* pub,
const FoilKeyRsaPublicData* data)
FOIL_INTERNAL;
+gboolean
+foil_key_rsa_public_data_write_ssh_rsa(
+ FoilOutput* out,
+ const FoilKeyRsaPublicData* data)
+ FOIL_INTERNAL;
+
+GBytes*
+foil_key_rsa_public_data_ssh_rsa_bytes(
+ const FoilKeyRsaPublicData* data)
+ FOIL_INTERNAL;
+
+gboolean
+foil_key_rsa_public_parse_ssh_rsa_binary(
+ FoilKeyRsaPublicData* key,
+ const FoilBytes* data)
+ FOIL_INTERNAL;
+
GBytes*
foil_key_rsa_public_data_fingerprint(
const FoilKeyRsaPublicData* data)
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_pool.h
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2019-2022 by Slava Monich
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -39,10 +37,10 @@
typedef struct foil_pool_item FoilPoolItem;
-typedef struct foil_pool {
+struct foil_pool {
FoilPoolItem* first;
FoilPoolItem* last;
-} FoilPool;
+};
void
foil_pool_init(
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/foil_types_p.h
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -41,7 +39,7 @@
#include <glib-object.h>
-typedef struct foil_key_rsa_public_data FoilKeyRsaPublicData;
+typedef struct foil_pool FoilPool;
#define FOIL_INTERNAL G_GNUC_INTERNAL
@@ -50,6 +48,9 @@
#define FOIL_BYTES_SET(bytes,data) \
((bytes).val = data, (bytes).len = sizeof(data), (void)0)
+#define FOIL_ARRAY_AND_SIZE(a) (a), (sizeof(a))
+#define FOIL_ARRAY_AND_COUNT(a) (a), (G_N_ELEMENTS(a))
+
#endif /* FOIL_TYPES_P_H */
/*
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_cipher_aes_decrypt.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,20 +32,31 @@
#include "foil_cipher_aes.h"
+/* Yes we know that this API is deprecated */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/aes.h>
+#include <openssl/modes.h>
+
+typedef struct foil_openssl_cipher_aes_decrypt {
+ FoilCipherAes parent;
+ AES_KEY aes;
+} FoilOpensslCipherAesDecrypt;
-typedef struct foil_openssl_cipher_decrypt_class {
- FoilCipherAesClass aes;
+typedef struct foil_openssl_cipher_aes_decrypt_class {
+ FoilCipherAesClass parent;
int (*fn_set_key)(const unsigned char* data, const int bits, AES_KEY *key);
+ void (*fn_reset)(FoilOpensslCipherAesDecrypt* self);
} FoilOpensslCipherAesDecryptClass;
-typedef struct foil_openssl_cipher_decrypt {
- FoilCipherAes cipher_aes;
- AES_KEY aes;
-} FoilOpensslCipherAesDecrypt;
+typedef struct foil_openssl_cipher_aes_ctr_decrypt {
+ FoilOpensslCipherAesDecrypt parent;
+ guint8 iv[FOIL_AES_BLOCK_SIZE];
+} FoilOpensslCipherAesCtrDecrypt;
typedef FoilOpensslCipherAesDecryptClass FoilOpensslCipherAesCbcDecryptClass;
typedef FoilOpensslCipherAesDecryptClass FoilOpensslCipherAesCfbDecryptClass;
+typedef FoilOpensslCipherAesDecryptClass FoilOpensslCipherAesCtrDecryptClass;
typedef FoilOpensslCipherAesDecryptClass FoilOpensslCipherAesEcbDecryptClass;
typedef FoilOpensslCipherAesDecrypt FoilOpensslCipherAesCbcDecrypt;
typedef FoilOpensslCipherAesDecrypt FoilOpensslCipherAesCfbDecrypt;
@@ -54,6 +65,7 @@
GType foil_openssl_cipher_aes_decrypt_get_type() FOIL_INTERNAL;
GType foil_openssl_cipher_aes_cbc_decrypt_get_type() FOIL_INTERNAL;
GType foil_openssl_cipher_aes_cfb_decrypt_get_type() FOIL_INTERNAL;
+GType foil_openssl_cipher_aes_ctr_decrypt_get_type() FOIL_INTERNAL;
GType foil_openssl_cipher_aes_ecb_decrypt_get_type() FOIL_INTERNAL;
G_DEFINE_ABSTRACT_TYPE(FoilOpensslCipherAesDecrypt,
@@ -63,14 +75,32 @@
foil_openssl_cipher_aes_decrypt_get_type()
#define FOIL_OPENSSL_CIPHER_AES_DECRYPT(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT, FoilOpensslCipherAesDecrypt)
+#define FOIL_OPENSSL_CIPHER_AES_DECRYPT_CLASS(klass) \
+ G_TYPE_CHECK_CLASS_CAST(klass, FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT, \
+ FoilOpensslCipherAesDecryptClass)
#define FOIL_OPENSSL_CIPHER_AES_DECRYPT_GET_CLASS(obj) \
G_TYPE_INSTANCE_GET_CLASS(obj, FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT, \
FoilOpensslCipherAesDecryptClass)
+#define FOIL_TYPE_OPENSSL_CIPHER_AES_CTR_DECRYPT \
+ foil_openssl_cipher_aes_ctr_decrypt_get_type()
+#define FOIL_OPENSSL_CIPHER_AES_CTR_DECRYPT(obj) \
+ G_TYPE_CHECK_INSTANCE_CAST(obj, FOIL_TYPE_OPENSSL_CIPHER_AES_CTR_DECRYPT, \
+ FoilOpensslCipherAesCtrDecrypt)
+
+#define foil_openssl_cipher_aes_cbc_decrypt_init \
+ foil_openssl_cipher_aes_decrypt_init
+#define foil_openssl_cipher_aes_cfb_decrypt_init \
+ foil_openssl_cipher_aes_decrypt_init
+#define foil_openssl_cipher_aes_ecb_decrypt_init \
+ foil_openssl_cipher_aes_decrypt_init
+
G_DEFINE_TYPE(FoilOpensslCipherAesCbcDecrypt,
foil_openssl_cipher_aes_cbc_decrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT)
G_DEFINE_TYPE(FoilOpensslCipherAesCfbDecrypt,
foil_openssl_cipher_aes_cfb_decrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT)
+G_DEFINE_TYPE(FoilOpensslCipherAesCtrDecrypt,
+ foil_openssl_cipher_aes_ctr_decrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT)
G_DEFINE_TYPE(FoilOpensslCipherAesEcbDecrypt,
foil_openssl_cipher_aes_ecb_decrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_DECRYPT)
@@ -84,6 +114,11 @@
return foil_openssl_cipher_aes_cfb_decrypt_get_type();
}
+GType foil_impl_cipher_aes_ctr_decrypt_get_type()
+{
+ return foil_openssl_cipher_aes_ctr_decrypt_get_type();
+}
+
GType foil_impl_cipher_aes_ecb_decrypt_get_type()
{
return foil_openssl_cipher_aes_ecb_decrypt_get_type();
@@ -93,12 +128,12 @@
int
foil_openssl_cipher_aes_cbc_decrypt_step(
FoilCipher* cipher,
- const void* from,
- void* to)
+ const void* in,
+ void* out)
{
FoilOpensslCipherAesDecrypt* self = FOIL_OPENSSL_CIPHER_AES_DECRYPT(cipher);
- AES_cbc_encrypt(from, to, FOIL_AES_BLOCK_SIZE, &self->aes,
- self->cipher_aes.block, AES_DECRYPT);
+ AES_cbc_encrypt(in, out, FOIL_AES_BLOCK_SIZE, &self->aes,
+ self->parent.block, AES_DECRYPT);
return FOIL_AES_BLOCK_SIZE;
}
@@ -106,13 +141,28 @@
int
foil_openssl_cipher_aes_cfb_decrypt_step(
FoilCipher* cipher,
- const void* from,
- void* to)
+ const void* in,
+ void* out)
{
int num = 0;
FoilOpensslCipherAesDecrypt* self = FOIL_OPENSSL_CIPHER_AES_DECRYPT(cipher);
- AES_cfb128_encrypt(from, to, FOIL_AES_BLOCK_SIZE, &self->aes,
- self->cipher_aes.block, &num, AES_DECRYPT);
+ AES_cfb128_encrypt(in, out, FOIL_AES_BLOCK_SIZE, &self->aes,
+ self->parent.block, &num, AES_DECRYPT);
+ return FOIL_AES_BLOCK_SIZE;
+}
+
+static
+int
+foil_openssl_cipher_aes_ctr_decrypt_step(
+ FoilCipher* cipher,
+ const void* in,
+ void* out)
+{
+ unsigned int num = 0;
+ FoilOpensslCipherAesCtrDecrypt* self =
+ FOIL_OPENSSL_CIPHER_AES_CTR_DECRYPT(cipher);
+ CRYPTO_ctr128_encrypt(in, out, FOIL_AES_BLOCK_SIZE, &self->parent.aes,
+ self->iv, self->parent.parent.block, &num, (block128_f) AES_encrypt);
return FOIL_AES_BLOCK_SIZE;
}
@@ -120,11 +170,11 @@
int
foil_openssl_cipher_aes_ecb_decrypt_step(
FoilCipher* cipher,
- const void* from,
- void* to)
+ const void* in,
+ void* out)
{
FoilOpensslCipherAesDecrypt* self = FOIL_OPENSSL_CIPHER_AES_DECRYPT(cipher);
- AES_ecb_encrypt(from, to, &self->aes, AES_DECRYPT);
+ AES_ecb_encrypt(in, out, &self->aes, AES_DECRYPT);
return FOIL_AES_BLOCK_SIZE;
}
@@ -141,13 +191,27 @@
static
void
+foil_openssl_cipher_aes_ctr_decrypt_reset(
+ FoilOpensslCipherAesDecrypt* aes)
+{
+ FoilKey* key = FOIL_CIPHER(aes)->key;
+ FoilOpensslCipherAesCtrDecrypt* self =
+ FOIL_OPENSSL_CIPHER_AES_CTR_DECRYPT(aes);
+ FOIL_OPENSSL_CIPHER_AES_DECRYPT_CLASS
+ (foil_openssl_cipher_aes_ctr_decrypt_parent_class)->
+ fn_reset(&self->parent);
+ memcpy(self->iv, FOIL_KEY_AES_(key)->iv, FOIL_AES_BLOCK_SIZE);
+}
+
+static
+void
foil_openssl_cipher_aes_decrypt_init_with_key(
FoilCipher* cipher,
FoilKey* key)
{
FOIL_CIPHER_CLASS(foil_openssl_cipher_aes_decrypt_parent_class)->
fn_init_with_key(cipher, key);
- foil_openssl_cipher_aes_decrypt_reset
+ FOIL_OPENSSL_CIPHER_AES_DECRYPT_GET_CLASS(cipher)->fn_reset
(FOIL_OPENSSL_CIPHER_AES_DECRYPT(cipher));
}
@@ -159,7 +223,7 @@
{
FOIL_CIPHER_CLASS(foil_openssl_cipher_aes_decrypt_parent_class)->
fn_copy(dest, src);
- foil_openssl_cipher_aes_decrypt_reset
+ FOIL_OPENSSL_CIPHER_AES_DECRYPT_GET_CLASS(dest)->fn_reset
(FOIL_OPENSSL_CIPHER_AES_DECRYPT(dest));
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_cipher_aes_encrypt.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,16 +32,30 @@
#include "foil_cipher_aes.h"
+/* Yes we know that this API is deprecated */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/aes.h>
+#include <openssl/modes.h>
-typedef struct foil_openssl_cipher_encrypt {
- FoilCipherAes cipher_aes;
+typedef struct foil_openssl_cipher_aes_encrypt {
+ FoilCipherAes parent;
AES_KEY aes;
} FoilOpensslCipherAesEncrypt;
-typedef FoilCipherAesClass FoilOpensslCipherAesEncryptClass;
+typedef struct foil_openssl_cipher_aes_ctr_encrypt {
+ FoilOpensslCipherAesEncrypt parent;
+ guint8 iv[FOIL_AES_BLOCK_SIZE];
+} FoilOpensslCipherAesCtrEncrypt;
+
+typedef struct foil_openssl_cipher_aes_encrypt_class {
+ FoilCipherAesClass aes_encrypt;
+ void (*fn_reset)(FoilOpensslCipherAesEncrypt* self);
+} FoilOpensslCipherAesEncryptClass;
+
typedef FoilOpensslCipherAesEncryptClass FoilOpensslCipherAesCbcEncryptClass;
typedef FoilOpensslCipherAesEncryptClass FoilOpensslCipherAesCfbEncryptClass;
+typedef FoilOpensslCipherAesEncryptClass FoilOpensslCipherAesCtrEncryptClass;
typedef FoilOpensslCipherAesEncryptClass FoilOpensslCipherAesEcbEncryptClass;
typedef FoilOpensslCipherAesEncrypt FoilOpensslCipherAesCbcEncrypt;
typedef FoilOpensslCipherAesEncrypt FoilOpensslCipherAesCfbEncrypt;
@@ -50,6 +64,7 @@
GType foil_openssl_cipher_aes_encrypt_get_type() FOIL_INTERNAL;
GType foil_openssl_cipher_aes_cbc_encrypt_get_type() FOIL_INTERNAL;
GType foil_openssl_cipher_aes_cfb_encrypt_get_type() FOIL_INTERNAL;
+GType foil_openssl_cipher_aes_ctr_encrypt_get_type() FOIL_INTERNAL;
GType foil_openssl_cipher_aes_ecb_encrypt_get_type() FOIL_INTERNAL;
G_DEFINE_ABSTRACT_TYPE(FoilOpensslCipherAesEncrypt,
@@ -57,15 +72,40 @@
#define FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT \
foil_openssl_cipher_aes_encrypt_get_type()
-#define FOIL_OPENSSL_CIPHER_AES_ENCRYPT(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
- FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT, FoilOpensslCipherAesEncrypt)
+#define FOIL_TYPE_OPENSSL_CIPHER_AES_CTR_ENCRYPT \
+ foil_openssl_cipher_aes_ctr_encrypt_get_type()
+#define FOIL_OPENSSL_CIPHER_AES_ENCRYPT(obj) \
+ G_TYPE_CHECK_INSTANCE_CAST(obj, FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT, \
+ FoilOpensslCipherAesEncrypt)
+#define FOIL_OPENSSL_CIPHER_AES_CTR_ENCRYPT(obj) \
+ G_TYPE_CHECK_INSTANCE_CAST(obj, FOIL_TYPE_OPENSSL_CIPHER_AES_CTR_ENCRYPT, \
+ FoilOpensslCipherAesCtrEncrypt)
+#define FOIL_OPENSSL_CIPHER_AES_ENCRYPT_CLASS(klass) \
+ G_TYPE_CHECK_CLASS_CAST(klass, FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT, \
+ FoilOpensslCipherAesEncryptClass)
+#define FOIL_OPENSSL_CIPHER_AES_ENCRYPT_GET_CLASS(obj) \
+ G_TYPE_INSTANCE_GET_CLASS(obj, FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT, \
+ FoilOpensslCipherAesEncryptClass)
+
+#define foil_openssl_cipher_aes_cbc_encrypt_init \
+ foil_openssl_cipher_aes_encrypt_init
+#define foil_openssl_cipher_aes_cfb_encrypt_init \
+ foil_openssl_cipher_aes_encrypt_init
+#define foil_openssl_cipher_aes_ecb_encrypt_init \
+ foil_openssl_cipher_aes_encrypt_init
G_DEFINE_TYPE(FoilOpensslCipherAesCbcEncrypt,
- foil_openssl_cipher_aes_cbc_encrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
+ foil_openssl_cipher_aes_cbc_encrypt,
+ FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
G_DEFINE_TYPE(FoilOpensslCipherAesCfbEncrypt,
- foil_openssl_cipher_aes_cfb_encrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
+ foil_openssl_cipher_aes_cfb_encrypt,
+ FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
+G_DEFINE_TYPE(FoilOpensslCipherAesCtrEncrypt,
+ foil_openssl_cipher_aes_ctr_encrypt,
+ FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
G_DEFINE_TYPE(FoilOpensslCipherAesEcbEncrypt,
- foil_openssl_cipher_aes_ecb_encrypt, FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
+ foil_openssl_cipher_aes_ecb_encrypt,
+ FOIL_TYPE_OPENSSL_CIPHER_AES_ENCRYPT)
GType foil_impl_cipher_aes_cbc_encrypt_get_type()
{
@@ -77,6 +117,11 @@
return foil_openssl_cipher_aes_cfb_encrypt_get_type();
}
+GType foil_impl_cipher_aes_ctr_encrypt_get_type()
+{
+ return foil_openssl_cipher_aes_ctr_encrypt_get_type();
+}
+
GType foil_impl_cipher_aes_ecb_encrypt_get_type()
{
return foil_openssl_cipher_aes_ecb_encrypt_get_type();
@@ -86,12 +131,12 @@
int
foil_openssl_cipher_aes_cbc_encrypt_step(
FoilCipher* cipher,
- const void* from,
- void* to)
+ const void* in,
+ void* out)
{
FoilOpensslCipherAesEncrypt* self = FOIL_OPENSSL_CIPHER_AES_ENCRYPT(cipher);
- AES_cbc_encrypt(from, to, FOIL_AES_BLOCK_SIZE, &self->aes,
- self->cipher_aes.block, AES_ENCRYPT);
+ AES_cbc_encrypt(in, out, FOIL_AES_BLOCK_SIZE, &self->aes,
+ self->parent.block, AES_ENCRYPT);
return FOIL_AES_BLOCK_SIZE;
}
@@ -99,13 +144,29 @@
int
foil_openssl_cipher_aes_cfb_encrypt_step(
FoilCipher* cipher,
- const void* from,
- void* to)
+ const void* in,
+ void* out)
{
int num = 0;
FoilOpensslCipherAesEncrypt* self = FOIL_OPENSSL_CIPHER_AES_ENCRYPT(cipher);
- AES_cfb128_encrypt(from, to, FOIL_AES_BLOCK_SIZE, &self->aes,
- self->cipher_aes.block, &num, AES_ENCRYPT);
+ AES_cfb128_encrypt(in, out, FOIL_AES_BLOCK_SIZE, &self->aes,
+ self->parent.block, &num, AES_ENCRYPT);
+ return FOIL_AES_BLOCK_SIZE;
+}
+
+static
+int
+foil_openssl_cipher_aes_ctr_encrypt_step(
+ FoilCipher* cipher,
+ const void* in,
+ void* out)
+{
+ unsigned int num = 0;
+ FoilOpensslCipherAesCtrEncrypt* self =
+ FOIL_OPENSSL_CIPHER_AES_CTR_ENCRYPT(cipher);
+ CRYPTO_ctr128_encrypt(in, out, FOIL_AES_BLOCK_SIZE, &self->parent.aes,
+ self->iv, FOIL_CIPHER_AES(cipher)->block, &num,
+ (block128_f) AES_encrypt);
return FOIL_AES_BLOCK_SIZE;
}
@@ -113,11 +174,11 @@
int
foil_openssl_cipher_aes_ecb_encrypt_step(
FoilCipher* cipher,
- const void* from,
- void* to)
+ const void* in,
+ void* out)
{
FoilOpensslCipherAesEncrypt* self = FOIL_OPENSSL_CIPHER_AES_ENCRYPT(cipher);
- AES_ecb_encrypt(from, to, &self->aes, AES_ENCRYPT);
+ AES_ecb_encrypt(in, out, &self->aes, AES_ENCRYPT);
return FOIL_AES_BLOCK_SIZE;
}
@@ -133,14 +194,27 @@
static
void
+foil_openssl_cipher_aes_ctr_encrypt_reset(
+ FoilOpensslCipherAesEncrypt* aes)
+{
+ FoilKey* key = FOIL_CIPHER(aes)->key;
+ FOIL_OPENSSL_CIPHER_AES_ENCRYPT_CLASS
+ (foil_openssl_cipher_aes_ctr_encrypt_parent_class)->
+ fn_reset(aes);
+ memcpy(FOIL_OPENSSL_CIPHER_AES_CTR_ENCRYPT(aes)->iv,
+ FOIL_KEY_AES_(key)->iv, FOIL_AES_BLOCK_SIZE);
+}
+
+static
+void
foil_openssl_cipher_aes_encrypt_init_with_key(
FoilCipher* cipher,
FoilKey* key)
{
FOIL_CIPHER_CLASS(foil_openssl_cipher_aes_encrypt_parent_class)->
fn_init_with_key(cipher, key);
- foil_openssl_cipher_aes_encrypt_reset
- (FOIL_OPENSSL_CIPHER_AES_ENCRYPT(cipher));
+ FOIL_OPENSSL_CIPHER_AES_ENCRYPT_GET_CLASS(cipher)->
+ fn_reset(FOIL_OPENSSL_CIPHER_AES_ENCRYPT(cipher));
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_cipher_des_cbc.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019-2022 by Slava Monich
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +33,9 @@
#include "foil_cipher_sync.h"
#include "foil_util_p.h"
+/* Yes we know that this API is deprecated */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "foil_openssl_des.h"
/* Logging */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_digest_md5.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -34,6 +32,9 @@
#include "foil_digest_p.h"
+/* Yes we know that this API is deprecated (as well as MD5 in general) */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/md5.h>
/* Logging */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_digest_sha1.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -34,6 +32,9 @@
#include "foil_digest_p.h"
+/* Yes we know that this API is deprecated */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/sha.h>
/* Logging */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_digest_sha256.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -34,6 +32,9 @@
#include "foil_digest_p.h"
+/* Yes we know that this API is deprecated */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/sha.h>
/* Logging */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_digest_sha512.c
^
|
@@ -1,13 +1,13 @@
/*
- * Copyright (C) 2021-2022 by Slava Monich
+ * Copyright (C) 2021-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1.Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2.Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
@@ -32,6 +32,9 @@
#include "foil_digest_p.h"
+/* Yes we know that this API is deprecated */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include <openssl/sha.h>
/* Logging */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoil/src/openssl/foil_openssl_key_des.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 by Slava Monich
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,6 +30,9 @@
* any official policies, either expressed or implied.
*/
+/* Yes we know that this API is deprecated (as well as DES in general) */
+#define OPENSSL_SUPPRESS_DEPRECATED
+
#include "foil_openssl_des.h"
/* Logging */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoilmsg/Makefile
^
|
@@ -1,6 +1,7 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: clean distclean all debug release coverage
+.PHONY: clean distclean all debug release coverage pkgconfig
+.PHONY: print_debug_lib print_release_lib print_coverage_lib
#
# Required packages
@@ -12,7 +13,7 @@
# Default target
#
-all: debug release
+all: debug release
#
# Library name
@@ -41,6 +42,21 @@
RELEASE_BUILD_DIR = $(BUILD_DIR)/release
COVERAGE_BUILD_DIR = $(BUILD_DIR)/coverage
LIBFOIL_DIR = ../libfoil
+LIBFOIL_INCLUDE_DIR = $(LIBFOIL_DIR)/include
+
+#
+# Library version
+#
+
+VERSION_FILE = $(LIBFOIL_INCLUDE_DIR)/foil_version.h
+get_version = $(shell grep -E '^ *\#define +FOIL_VERSION_$1 +[0-9]+$$' $(VERSION_FILE) | sed 's/ */ /g' | cut -d ' ' -f 3)
+
+VERSION_MAJOR = $(call get_version,MAJOR)
+VERSION_MINOR = $(call get_version,MINOR)
+VERSION_RELEASE = $(call get_version,RELEASE)
+
+# Full version
+PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
#
# Tools and flags
@@ -48,19 +64,18 @@
CC = $(CROSS_COMPILE)gcc
ARFLAGS = rc
-WARNINGS = -Wall
-INCLUDES = -I$(INCLUDE_DIR) -I$(SRC_DIR) -I$(LIBFOIL_DIR)/include
+WARNINGS = -Wall -Wstrict-aliasing -Wunused-result
+INCLUDES = -I$(INCLUDE_DIR) -I$(SRC_DIR) -I$(LIBFOIL_INCLUDE_DIR)
BASE_FLAGS = -fPIC
FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
+ -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \
-MMD -MP $(shell pkg-config --cflags $(PKGS))
DEBUG_FLAGS = -g
RELEASE_FLAGS =
COVERAGE_FLAGS = -g
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
+KEEP_SYMBOLS ?= 0
ifneq ($(KEEP_SYMBOLS),0)
RELEASE_FLAGS += -g
endif
@@ -73,10 +88,15 @@
# Files
#
+PKGCONFIG = $(BUILD_DIR)/$(LIB_NAME).pc
DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
COVERAGE_OBJS = $(SRC:%.c=$(COVERAGE_BUILD_DIR)/%.o)
+DEBUG_LIB = $(DEBUG_BUILD_DIR)/$(LIB)
+RELEASE_LIB = $(RELEASE_BUILD_DIR)/$(LIB)
+COVERAGE_LIB = $(COVERAGE_BUILD_DIR)/$(LIB)
+
#
# Dependencies
#
@@ -88,6 +108,7 @@
endif
endif
+$(PKGCONFIG): | $(BUILD_DIR)
$(DEBUG_OBJS) $(DEBUG_LIB): | $(DEBUG_BUILD_DIR)
$(RELEASE_OBJS) $(RELEASE_LIB): | $(RELEASE_BUILD_DIR)
$(COVERAGE_OBJS) $(COVERAGE_LIB): | $(COVERAGE_BUILD_DIR)
@@ -96,16 +117,14 @@
# Rules
#
-DEBUG_LIB = $(DEBUG_BUILD_DIR)/$(LIB)
-RELEASE_LIB = $(RELEASE_BUILD_DIR)/$(LIB)
-COVERAGE_LIB = $(COVERAGE_BUILD_DIR)/$(LIB)
-
debug: $(DEBUG_LIB)
release: $(RELEASE_LIB)
coverage: $(COVERAGE_LIB)
+pkgconfig: $(PKGCONFIG)
+
print_debug_lib:
@echo $(DEBUG_LIB)
@@ -121,7 +140,7 @@
rm -f *~ $(SRC_DIR)/*~ $(INCLUDE_DIR)/*~
rm -fr $(BUILD_DIR)
-$(GEN_DIR):
+$(BUILD_DIR):
mkdir -p $@
$(DEBUG_BUILD_DIR):
@@ -153,3 +172,40 @@
$(COVERAGE_LIB): $(COVERAGE_BUILD_DIR) $(COVERAGE_OBJS)
$(AR) $(ARFLAGS) $@ $(COVERAGE_OBJS)
ranlib $@
+
+#
+# LIBDIR usually gets substituted with arch specific dir.
+# It's relative in deb build and can be whatever in rpm build.
+#
+
+LIBDIR ?= usr/lib
+ABS_LIBDIR := $(shell echo /$(LIBDIR) | sed -r 's|/+|/|g')
+
+$(PKGCONFIG): $(LIB_NAME).pc.in Makefile
+ sed -e 's|@version@|$(PCVERSION)|g' -e 's|@libdir@|$(ABS_LIBDIR)|g' $< > $@
+
+#
+# Install
+#
+
+INSTALL = install
+INSTALL_DIRS = $(INSTALL) -d
+INSTALL_FILES = $(INSTALL) -m 644
+
+INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR)
+INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(NAME)
+INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig
+
+install-dev: $(INSTALL_LIB_DIR) $(INSTALL_INCLUDE_DIR) $(INSTALL_PKGCONFIG_DIR)
+ $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR)
+ $(INSTALL_FILES) $(INCLUDE_DIR)/*.h $(INSTALL_INCLUDE_DIR)
+ $(INSTALL_FILES) $(PKGCONFIG) $(INSTALL_PKGCONFIG_DIR)
+
+$(INSTALL_LIB_DIR):
+ $(INSTALL_DIRS) $@
+
+$(INSTALL_INCLUDE_DIR):
+ $(INSTALL_DIRS) $@
+
+$(INSTALL_PKGCONFIG_DIR):
+ $(INSTALL_DIRS) $@
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoilmsg/include/foilmsg.h
^
|
@@ -1,13 +1,13 @@
/*
- * Copyright (C) 2016-2021 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1.Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2.Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
@@ -56,6 +56,7 @@
#define FOILMSG_ENCRYPT_FORMAT_AES_CBC (1)
#define FOILMSG_ENCRYPT_FORMAT_AES_CFB (2)
+#define FOILMSG_ENCRYPT_FORMAT_AES_CTR (3) /* Since 1.0.28 */
#define FOILMSG_SIGNATURE_FORMAT_MD5_RSA (1)
#define FOILMSG_SIGNATURE_FORMAT_SHA1_RSA (2)
@@ -103,7 +104,8 @@
typedef enum foilmsg_cipher {
FOILMSG_CIPHER_AES_CBC,
- FOILMSG_CIPHER_AES_CFB
+ FOILMSG_CIPHER_AES_CFB,
+ FOILMSG_CIPHER_AES_CTR /* Since 1.0.28 */
} FOILMSG_CIPHER;
typedef enum foilmsg_signature {
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoilmsg/libfoilmsg.pc.in
^
|
@@ -0,0 +1,10 @@
+name=foilmsg
+libdir=@libdir@
+includedir=/usr/include
+
+Name: lib${name}
+Description: Library for encrypting and decrypting individual messages
+Version: @version@
+Requires.private: libfoil libglibutil glib-2.0
+Libs: -L${libdir} -l${name}
+Cflags: -I${includedir}/${name}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoilmsg/src/foilmsg_decrypt.c
^
|
@@ -1,31 +1,29 @@
/*
- * Copyright (C) 2016-2021 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation
* are those of the authors and should not be interpreted as representing
@@ -335,6 +333,9 @@
case FOILMSG_ENCRYPT_FORMAT_AES_CFB:
block_cipher_type = FOIL_CIPHER_AES_CFB_DECRYPT;
break;
+ case FOILMSG_ENCRYPT_FORMAT_AES_CTR:
+ block_cipher_type = FOIL_CIPHER_AES_CTR_DECRYPT;
+ break;
default:
GDEBUG("Unsupported cipher tag %d", enc_data_tag);
break;
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/libfoilmsg/src/foilmsg_encrypt.c
^
|
@@ -1,13 +1,13 @@
/*
- * Copyright (C) 2016-2021 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1.Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2.Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
@@ -360,6 +360,10 @@
type = FOIL_CIPHER_AES_CFB_ENCRYPT;
*tag = FOILMSG_ENCRYPT_FORMAT_AES_CFB;
break;
+ case FOILMSG_CIPHER_AES_CTR:
+ type = FOIL_CIPHER_AES_CTR_ENCRYPT;
+ *tag = FOILMSG_ENCRYPT_FORMAT_AES_CTR;
+ break;
}
return foil_cipher_new(type, key);
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/rpm/foil.spec
^
|
@@ -1,6 +1,6 @@
Name: libfoil
-Version: 1.0.27
+Version: 1.0.28
Release: 0
Summary: Yet another glib-style crypto API
Group: Development/Libraries
@@ -9,7 +9,7 @@
URL: https://github.com/monich/foil
Source: %{name}-%{version}.tar.bz2
-%define glib_version 2.36
+%define glib_version 2.32
%define libglibutil_version 1.0.24
%define libglibutil_build_version 1.0.54
@@ -29,16 +29,25 @@
%package devel
Summary: Development library for %{name}
+Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig(libglibutil) >= %{libglibutil_build_version}
%description devel
This package contains the development library for %{name}.
+%package -n libfoilmsg-devel
+Summary: Library for encrypting and decrypting messages
+Group: Development/Libraries
+Requires: pkgconfig(libfoil)
+
+%description -n libfoilmsg-devel
+This package contains the development library for libfoilmsg.
+
%package -n foil-tools
Summary: Encryption/decryption utilities
Group: Applications/File
-Requires: libfoil >= 1.0.13
+Requires: libfoil >= %{version}
%description -n foil-tools
Command line encryption/decryption utilities.
@@ -48,11 +57,12 @@
%build
make -C libfoil %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
+make -C libfoilmsg %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
make -C tools %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release
%install
-rm -rf %{buildroot}
make -C libfoil DESTDIR=%{buildroot} LIBDIR=%{_libdir} install-dev
+make -C libfoilmsg DESTDIR=%{buildroot} LIBDIR=%{_libdir} install-dev
make -C tools DESTDIR=%{buildroot} install
%check
@@ -68,10 +78,18 @@
%files devel
%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/*.pc
+%dir %{_includedir}/foil
+%{_libdir}/pkgconfig/libfoil.pc
%{_libdir}/%{name}.so
%{_includedir}/foil/*.h
+%files -n libfoilmsg-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/foilmsg
+%{_libdir}/pkgconfig/libfoilmsg.pc
+%{_libdir}/libfoilmsg.a
+%{_includedir}/foilmsg/*.h
+
%files -n foil-tools
%defattr(-,root,root,-)
%{_bindir}/foilmsg
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_cipher_aes/test_cipher_aes.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2019 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -36,6 +36,8 @@
#include "foil_cipher.h"
#include "foil_output.h"
+#include <gutil_misc.h>
+
#define DATA_DIR "data/"
#define TEST_TIMEOUT (10) /* seconds */
@@ -50,6 +52,15 @@
gsize input_size;
} TestCipherAes;
+typedef struct test_cipher_aes_vector {
+ const char* name;
+ const char* key_iv;
+ const char* in;
+ const char* out;
+ GType (*key_type)(void);
+ GType (*cipher_type)(void);
+} TestCipherAesVector;
+
static
void
test_padding(
@@ -263,8 +274,8 @@
GBytes* out2 = test_cipher_bytes(enc2, in);
FoilCipher* dec1 = foil_cipher_new(test->dec_type(), key);
FoilCipher* dec2 = foil_cipher_clone(dec1);
- GBytes* res1 = test_cipher_bytes(dec1, in);
- GBytes* res2 = test_cipher_bytes(dec2, in);
+ GBytes* res1 = test_cipher_bytes(dec1, out1);
+ GBytes* res2 = test_cipher_bytes(dec2, out2);
GDEBUG("Plain text:");
TEST_DEBUG_HEXDUMP_BYTES(in);
GDEBUG("Encrypted (%u bytes):", (guint)g_bytes_get_size(out1));
@@ -387,6 +398,40 @@
g_free(key_path);
}
+static
+void
+test_cipher_aes_vector(
+ gconstpointer param)
+{
+ const TestCipherAesVector* test = param;
+ GBytes* key_bytes = gutil_hex2bytes(test->key_iv, -1);
+ GBytes* in_bytes = gutil_hex2bytes(test->in, -1);
+ FoilKey* key = foil_key_new_from_bytes(test->key_type(), key_bytes);
+ GBytes* out = foil_cipher_bytes(test->cipher_type(), key, in_bytes);
+ GBytes* out_expected = gutil_hex2bytes(test->out, -1);
+
+ GDEBUG("Key+IV:");
+ g_assert(key_bytes);
+ TEST_DEBUG_HEXDUMP_BYTES(key_bytes);
+
+ GDEBUG("In:");
+ g_assert(in_bytes);
+ TEST_DEBUG_HEXDUMP_BYTES(in_bytes);
+
+ GDEBUG("Out:");
+ g_assert(out);
+ TEST_DEBUG_HEXDUMP_BYTES(out);
+
+ g_assert(out_expected);
+ g_assert(g_bytes_equal(out, out_expected));
+
+ g_bytes_unref(key_bytes);
+ g_bytes_unref(in_bytes);
+ g_bytes_unref(out);
+ g_bytes_unref(out_expected);
+ foil_key_unref(key);
+}
+
static const char input_short[] = "This is a secret.This is a secr";
static const char input_long[] =
"When in the Course of human events, it becomes necessary for one "
@@ -432,6 +477,8 @@
input_##name, sizeof(input_##name) }
#define TEST_CLONE(bits,name) \
TEST_CLONE_(bits,cbc,name), \
+ TEST_CLONE_(bits,cfb,name), \
+ TEST_CLONE_(bits,ctr,name), \
TEST_CLONE_(bits,ecb,name)
#define TEST_SYNC_(bits,mode,name) \
{ TEST_("sync" #bits "-" #mode "-" #name), \
@@ -441,6 +488,8 @@
input_##name, sizeof(input_##name) }
#define TEST_SYNC(bits,name) \
TEST_SYNC_(bits,cbc,name), \
+ TEST_SYNC_(bits,cfb,name), \
+ TEST_SYNC_(bits,ctr,name), \
TEST_SYNC_(bits,ecb,name)
#define TEST_ASYNC_(bits,mode,name) \
{ TEST_("async" #bits "-" #mode "-" #name), \
@@ -450,12 +499,20 @@
input_##name, sizeof(input_##name) }
#define TEST_ASYNC(bits,name) \
TEST_ASYNC_(bits,cbc,name), \
+ TEST_ASYNC_(bits,cfb,name), \
+ TEST_ASYNC_(bits,ctr,name), \
TEST_ASYNC_(bits,ecb,name)
static const TestCipherAes tests[] = {
{ TEST_("basic-cbc"), test_cipher_aes_basic, "aes128", NULL,
foil_impl_cipher_aes_cbc_encrypt_get_type,
foil_impl_cipher_aes_cbc_decrypt_get_type},
+ { TEST_("basic-cfb"), test_cipher_aes_basic, "aes128", NULL,
+ foil_impl_cipher_aes_cfb_encrypt_get_type,
+ foil_impl_cipher_aes_cfb_decrypt_get_type},
+ { TEST_("basic-ctr"), test_cipher_aes_basic, "aes128", NULL,
+ foil_impl_cipher_aes_ctr_encrypt_get_type,
+ foil_impl_cipher_aes_ctr_decrypt_get_type},
{ TEST_("basic-ecb"), test_cipher_aes_basic, "aes128", NULL,
foil_impl_cipher_aes_cbc_encrypt_get_type,
foil_impl_cipher_aes_cbc_decrypt_get_type},
@@ -480,6 +537,143 @@
TEST_ASYNC(256,long),
};
+/* Examples from NIST Special Publication 800-38A */
+static const TestCipherAesVector test_vectors[] = {
+#define TEST_VECTOR_(x) TEST_("vector/" x)
+#define TEST_VECTOR_INPUT \
+ "6bc1bee22e409f96e93d7e117393172a" \
+ "ae2d8a571e03ac9c9eb76fac45af8e51" \
+ "30c81c46a35ce411e5fbc1191a0a52ef" \
+ "f69f2445df4f9b17ad2b417be66c3710"
+#define TEST_VECTOR_ENCRYPT_DECRYPT(MODE,mode,bits,key,out) { \
+ TEST_VECTOR_(#MODE "-AES" #bits ".Encrypt"), #key, \
+ TEST_VECTOR_INPUT, #out, foil_key_aes##bits##_get_type, \
+ foil_impl_cipher_aes_##mode##_encrypt_get_type },{ \
+ TEST_VECTOR_(#MODE "-AES" #bits ".Decrypt"), #key, \
+ #out, TEST_VECTOR_INPUT, foil_key_aes##bits##_get_type, \
+ foil_impl_cipher_aes_##mode##_decrypt_get_type }
+
+ /* F.1.1 ECB-AES128.Encrypt */
+ /* F.1.2 ECB-AES128.Decrypt */
+ TEST_VECTOR_ENCRYPT_DECRYPT(ECB,ecb,128,
+ 2b7e151628aed2a6abf7158809cf4f3c\
+00000000000000000000000000000000,
+ 3ad77bb40d7a3660a89ecaf32466ef97\
+f5d3d58503b9699de785895a96fdbaaf\
+43b1cd7f598ece23881b00e3ed030688\
+7b0c785e27e8ad3f8223207104725dd4),
+
+ /* F.1.3 ECB-AES192.Encrypt */
+ /* F.1.4 ECB-AES192.Decrypt */
+ TEST_VECTOR_ENCRYPT_DECRYPT(ECB,ecb,192,
+ 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b\
+00000000000000000000000000000000,
+ bd334f1d6e45f25ff712a214571fa5cc\
+974104846d0ad3ad7734ecb3ecee4eef\
+ef7afd2270e2e60adce0ba2face6444e\
+9a4b41ba738d6c72fb16691603c18e0e),
+
+ /* F.1.5 ECB-AES256.Encrypt */
+ /* F.1.6 ECB-AES256.Decrypt */
+ TEST_VECTOR_ENCRYPT_DECRYPT(ECB,ecb,256,
+ 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4\
+00000000000000000000000000000000,
+ f3eed1bdb5d2a03c064b5a7e3db181f8\
+591ccb10d410ed26dc5ba74a31362870\
+b6ed21b99ca6f4f9f153e7b1beafed1d\
+23304b7a39f9f3ff067d8d8f9e24ecc7),
+
+ /* F.2.1 CBC-AES128.Encrypt */
+ /* F.2.2 CBC-AES128.Decrypt */
+ TEST_VECTOR_ENCRYPT_DECRYPT(CBC,cbc,128,
+ 2b7e151628aed2a6abf7158809cf4f3c\
+000102030405060708090a0b0c0d0e0f,
+ 7649abac8119b246cee98e9b12e9197d\
+5086cb9b507219ee95db113a917678b2\
+73bed6b8e3c1743b7116e69e22229516\
+3ff1caa1681fac09120eca307586e1a7),
+
+ /* F.2.3 CBC-AES192.Encrypt */
+ /* F.2.4 CBC-AES192.Decrypt */
+ TEST_VECTOR_ENCRYPT_DECRYPT(CBC,cbc,192,
+ 8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b\
+000102030405060708090a0b0c0d0e0f,
+ 4f021db243bc633d7178183a9fa071e8\
+b4d9ada9ad7dedf4e5e738763f69145a\
+571b242012fb7ae07fa9baac3df102e0\
+08b0e27988598881d920a9e64f5615cd),
+
+ /* F.2.5 CBC-AES256.Encrypt */
+ /* F.2.6 CBC-AES256.Decrypt */
+ TEST_VECTOR_ENCRYPT_DECRYPT(CBC,cbc,256,
+ 603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4\
+000102030405060708090a0b0c0d0e0f,
+ f58c4c04d6e5f1ba779eabfb5f7bfbd6\
+9cfc4e967edb808d679f777bc6702c7d\
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_input/test_input.c
^
|
@@ -1,16 +1,19 @@
/*
- * Copyright (C) 2016-2017 by Slava Monich
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1.Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- * 2.Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -444,151 +447,194 @@
g_bytes_unref(bytes_expected);
}
+/* base64 test */
+
+typedef struct test_input_base64_data {
+ const char* in;
+ const guint8* out;
+ gsize outbytes;
+ gsize remaining;
+ guint flags;
+} TestInputBase64;
+
static
void
test_input_base64(
- void)
+ gconstpointer param)
{
- static const guint8 out1[] = { 0x00 };
- static const guint8 out2[] = { 0x00, 0x01 };
- static const guint8 out3[] = { 0x00, 0x01, 0x02 };
- static const guint8 out5[] = { 0x00, 0x01, 0x02, 0xfb, 0xfc};
- static const guint8 out17[] = {
- 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
- 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
- 0x10};
- static const guint8 out265[] = {
- 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
- 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
- 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
- 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,
- 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
- 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,
- 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
- 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
- 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
- 0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,
- 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
- 0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,
- 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
- 0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,
- 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
- 0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,
- 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
- 0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
- 0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
- 0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
- 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,
- 0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,
- 0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,
- 0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,
- 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,
- 0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,
- 0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,
- 0xd8,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf,
- 0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,
- 0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,
- 0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,
- 0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff
- };
- static const struct test_input_base64_data {
- const char* in;
- const guint8* out;
- gsize outbytes;
- gsize remaining;
- guint flags;
- } testcases [] = {
-#define DATA_(a) a, G_N_ELEMENTS(a)
- { "\x80""AAA", NULL, 0, 4 },
- { "*AAA", NULL, 0, 4 },
- { "A*AA", NULL, 0, 4 },
- { "AA", DATA_(out1) },
- { "AA==", DATA_(out1) },
- { "AA=", DATA_(out1), 1 }, /* Short padding */
- { "AA=A", DATA_(out1), 2 },
- { "AA===", DATA_(out1), 1 },
- { "AAE=", DATA_(out2) },
- { "AAE =", DATA_(out2), 2}, /* Unexpected space */
- { "AAE =", DATA_(out2), 0, FOIL_INPUT_BASE64_IGNORE_SPACES },
- { "AAE ==", DATA_(out2), 1, FOIL_INPUT_BASE64_IGNORE_SPACES },
- { "AAEC==", DATA_(out3), 2 },
- { "AAEC+/w", DATA_(out5) },
- { "AAEC+/z", DATA_(out3), 3 },
- { "AAEC+/w-", DATA_(out5), 1 },
- { "AAEC-_w", DATA_(out5) },
- { "AAEC-_z", DATA_(out3), 3 },
- { "AAEC-_w+", DATA_(out5), 1 },
- { "AAECAwQFBgcICQoLDA0ODxA=", DATA_(out17), 0 },
- { "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGx"
- "wdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4"
- "OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVF"
- "VWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3Bx"
- "cnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY"
- "6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmq"
- "q6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxs"
- "fIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj"
- "5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w",
- DATA_(out265), 0}
- };
- guint i;
- for (i = 0; i < G_N_ELEMENTS(testcases); i++) {
- const struct test_input_base64_data* t = testcases + i;
- gsize inputlen = strlen(t->in);
- FoilInput* mem = foil_input_mem_new_static(t->in, inputlen);
- FoilInput* base64 = foil_input_base64_new_full(mem, t->flags);
- GBytes* decoded = foil_input_read_all(base64);
- GDEBUG("%s", t->in);
-
- g_assert(decoded);
- if (t->out) {
- g_assert(test_bytes_equal(decoded, t->out, t->outbytes));
- g_assert(inputlen - foil_input_bytes_read(mem) == t->remaining);
- } else {
- g_assert(!g_bytes_get_size(decoded));
- }
- g_bytes_unref(decoded);
+ const TestInputBase64* t = param;
+ gsize inputlen = strlen(t->in);
+ FoilInput* mem = foil_input_mem_new_static(t->in, inputlen);
+ FoilInput* base64 = foil_input_base64_new_full(mem, t->flags);
+ GBytes* decoded = foil_input_read_all(base64);
+ guint8 buf[6];
+ const gsize bufsize = MIN(t->outbytes, sizeof(buf));
+ gsize i;
+
+ GDEBUG("%s", t->in);
+ g_assert(decoded);
+ if (t->out) {
+ g_assert(test_bytes_equal(decoded, t->out, t->outbytes));
+ g_assert(inputlen - foil_input_bytes_read(mem) == t->remaining);
+ } else {
+ g_assert(!g_bytes_get_size(decoded));
+ }
+ g_bytes_unref(decoded);
+ foil_input_unref(base64);
+ foil_input_unref(mem);
+
+ /* Same but without output buffer */
+ mem = foil_input_mem_new_static(t->in, inputlen);
+ base64 = foil_input_base64_new_full(mem, t->flags);
+ g_assert((gsize)foil_input_skip(base64, t->outbytes) == t->outbytes);
+ g_assert(inputlen - foil_input_bytes_read(mem) == t->remaining);
+ foil_input_unref(base64);
+ foil_input_unref(mem);
+
+ /* Split reads */
+ for (i = 1; i + 1 < bufsize; i++) {
+ const gsize part2 = bufsize - i;
+ mem = foil_input_mem_new_static(t->in, inputlen);
+ base64 = foil_input_base64_new_full(mem, t->flags);
+ memset(buf, 0xff, bufsize);
+ g_assert_cmpint(foil_input_read(base64, buf, i), == ,i);
+ g_assert(!memcmp(buf, t->out, i));
+ g_assert_cmpint(foil_input_read(base64, buf + i, part2), == ,part2);
+ g_assert(!memcmp(buf, t->out, bufsize));
foil_input_unref(base64);
foil_input_unref(mem);
- /* Same but without output buffer */
+ /* Same but without the output buffer */
mem = foil_input_mem_new_static(t->in, inputlen);
base64 = foil_input_base64_new_full(mem, t->flags);
- g_assert((gsize)foil_input_skip(base64, t->outbytes) == t->outbytes);
- g_assert(inputlen - foil_input_bytes_read(mem) == t->remaining);
+ g_assert_cmpint(foil_input_read(base64, NULL, i), == ,i);
+ g_assert_cmpint(foil_input_read(base64, NULL, part2), == ,part2);
foil_input_unref(base64);
foil_input_unref(mem);
+ }
- if (t->remaining) {
- /* Check the validation option */
- FoilOutput* out = foil_output_mem_new(NULL);
- gsize copied = 0;
-
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_aes/test_key_aes.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -170,7 +170,7 @@
FoilKey* key3;
/* Only default format is valid for AES keys */
- g_assert(!foil_key_to_binary_format(key1, FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1));
+ g_assert(!foil_key_to_binary_format(key1,FOIL_KEY_BINARY_FORMAT_RSA_PKCS1));
g_assert(!foil_key_to_binary_format(key1, FOIL_KEY_BINARY_FORMAT_RSA_SSH));
g_assert(!foil_key_to_binary_format(key1, (FoilKeyBinaryFormat)-1));
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_des/test_key_des.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -131,7 +131,7 @@
GError* error = NULL;
/* Only default format is valid for DES keys */
- g_assert(!foil_key_to_binary_format(key, FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1));
+ g_assert(!foil_key_to_binary_format(key, FOIL_KEY_BINARY_FORMAT_RSA_PKCS1));
g_assert(!foil_key_to_binary_format(key, FOIL_KEY_BINARY_FORMAT_RSA_SSH));
g_assert(!foil_key_to_binary_format(key, (FoilKeyBinaryFormat)-1));
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.020
^
|
@@ -0,0 +1 @@
+-----BEGIN OPENSSH PRIVATE KEY------
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.021
^
|
@@ -0,0 +1 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
\ No newline at end of file
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.022
^
|
@@ -0,0 +1,2 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.023
^
|
@@ -0,0 +1,2 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.024
^
|
@@ -0,0 +1,5 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+
+b3BlbnNzaC1rZXk=
+
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.025
^
|
@@ -0,0 +1,5 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+
+b3BlbnNzaC1rZXktdjEAAAA=
+
+-----END OPENSSH PRIVATE KEY-----
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.026
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.027
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.028
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.029
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.030
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.031
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.032
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.033
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.034
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.035
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.036
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.037
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.038
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.039
^
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/bad.040
^
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024
^
|
@@ -0,0 +1,16 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAlwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAIEAoG2Sm5p9zjFwk4TIPNGVzuFsngOIYFTnOraL3bWCAfGOpaSnRgWv
+Yvy92HtPpEmgCxyZMMcTd5WLh6kXdZ+Ub4xBK+gkw2j5HicvJTCa7PQJBxGgtgoFRvtpTU
+bjNq/cBkUydX0uzX7NtH3sc43dcKtYeHbGGY5nelcYCuUUzx8AAAIA8aW3nfGlt50AAAAH
+c3NoLXJzYQAAAIEAoG2Sm5p9zjFwk4TIPNGVzuFsngOIYFTnOraL3bWCAfGOpaSnRgWvYv
+y92HtPpEmgCxyZMMcTd5WLh6kXdZ+Ub4xBK+gkw2j5HicvJTCa7PQJBxGgtgoFRvtpTUbj
+Nq/cBkUydX0uzX7NtH3sc43dcKtYeHbGGY5nelcYCuUUzx8AAAADAQABAAAAgH2QBTVgn6
+Kos3HidU6Uw2neqcKrBSxQh4I+qg3nKFAZHgqrani1rmYNZxFuwhDVxzurMIMq7SOlmkWd
+pMzdD7FZNs5NxEi9mc23Q6X/sfnLwwAPZnM2+gFj/pW1dlc/gaDi/5PO7iNkUE7PGBosWd
+n7k+DOQf62rzB3tUoSJuhBAAAAQQC1xNiKjdznEU0moE866qdnQSr5l70fLUWbAKWBggqc
+AswKI5dn6ry2UOaNGaU7KSNhheJyY8xNxyCYcZhVSn65AAAAQQDVA6geJHwsuxoHp+r9iz
+OOtjmsZw0giPlEAJsEOCEKjrasHQaluDTXTRcdHAFp9CTI1oB/ayo0Uxs7MyYxxf6RAAAA
+QQDAzU2gKjqMl44dTjSptCelCuARsi96VWIZWWp2Rfd2PndaE7tolkvnKDOTTpaC4HiQzG
+PbgygBJLIfP8mfeCqvAAAABFRlc3QBAgMEBQY=
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.aes128cbc
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczEyOC1jYmMAAAAGYmNyeXB0AAAAGAAAABBLGHQHOJ
+KRBd56ffllc5abAAAABAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgAqISlkO/k85bkNoO2OHi7FR0mHs/8hAZbENWsOn2EJEt
+3YY4tMvDXDF7sL+0IsS99rPY2qKgCVnkipRPvMXM0TDCIGzT+ivg8fDmGCTnI+jVa76bGd
+hxroADQRgA6fNtS/zkVwRjUN7u9zHiXnJMYSJtX6k2bJBDOgvpkbM48gT9qdQrmR/8d8nx
+aITbz11/MBrTc+/xMIQLC+9aN7AWTCjgtxxG9mKZSm++MMF8/fIvQx0OjX5xcSI/y18L3d
+Mc1tCcBAb22jKJPWGrfqqAOS69eH7m2l0oAECvdwJecf/gwV+VdYNOBoBEQzZW2tAE2N3c
+HUi0+WY9ZQUPtVugHfqnu2PjNx+CmVCrV5Exy9+1RdbZjnf1euTC9TktH4GLalCp4nMHdp
+fBmhK0MtEBG4ldw2aX2UoGgcTLjuF0ctEdaEQsgOiKCLsNLg88iUFXYoOMzL9rIx1/QUYh
+TYaBGRhR04ogWiPpqawUOIRU4E5wSeo0daBGUS59+Drt8WD1Z1GsABGwRDj66qsQ4VTvrB
+S/HN05qDUYeXx2XjVsugnWPf0XJyloh5C/8O7bTG1KQaCPKJ1vCk0pjfL+ZMbyH98Zl0qb
+X6sWncXebL+Jg1agQbps7UideuIO+Ug6NQ4b1IRCET+ae7SLEUDMjqpta2uSc/47FJ99d7
+1FCTFT1UNQ==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.aes128ctr
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczEyOC1jdHIAAAAGYmNyeXB0AAAAGAAAABAezo4fTZ
+jfmRXQ0Ksr8/MuAAAABAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgDf84WsWU6166b636KZXtj2ZjiSKxEBcLxxl4jPQd/4aj
+Q6z5gLc36qAUGZT1iqnTDxaMl0EE2PlOGUWX2GlC+Cv0jIH6J9zCnSVGUrXV2DkJL3WOf3
+d7cd96hoy6mzOe7EtRKMRcUYBLTPZxHA2iJ0xupiQTnUXkU3zs+PqyNlp7FGFskXZ7qBIj
+WE+dLJx1+OwKy98BanhYfPDyvGM0LmK1LvwIUHtXmcVh5GmDlDcVr4bg7Id3yfeUXjWksG
+lXROnhwxlzgMo5rqmPBWUkSODtqub6RHlYQjnoZD52j7QFcy4F8jOgmZ2NFTgyyFA8GsPf
+sOqOXpLdGFO26cltmfgcy4lybIzgr0T5WYiJd0t219n8P1l094SXk8JZ8MYlPg6jpepHat
+WBQO2107bt/ej/fpMmp/WH7e78oaQOsMdZl9yv/4S8uHTBpNCnNxaTxZ8/Rc4XydnFOW9M
+6UnyZZckKQTq61XyYHfOvMC9DXcAjZ86wDRmducJ66/tOb9nmaIRwrLoUyHCE5ejswaXw5
+185a+lGCT06Qnf8uQqbvwbS98sO1DO/GYbUgox4w745trMMuNq/c0lrbNh1YjY7OZS2xf6
+6q3cNMrIIRPzAJfEPq/JLUYUvIxIGQyC5uEKJ6yaZuiw4UwiAyEei/iOVZO+f1GeAxUP2v
+TUEa7NbwVg==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.aes192cbc
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczE5Mi1jYmMAAAAGYmNyeXB0AAAAGAAAABCOD4f7JR
+bdQp5R07sBLDKQAAAABgAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgCpKDovhTUFNWDlV7S08DJ2i4znFG6ndeguNqHbOyPOvc
+fAOPuLhGejuYldDvav1Dbct/t3zVKee4t+MTUH0mVMVf1oEWW0zetqSMfMrYbCZzkETA4d
+tsILXTBYK21wrGOX8hCzR+3u0MOWolZJ6tZbp+Yu3sTIPq+BM3CIZR7nCycSde5X/gKZd/
++VRo/t9A5LsQ37MLzksX2ZjN7KWjCIEtgN1WD0iqjUzEjWmDh8kB93ZcbcKuv3TXDo4WZ3
+RGP3smTLrUlE0v3e7GlN/bqgc4qaEOvxhaThafvZPgismF1K2srlWKM1XMrSR3lKBlMC6X
+vtojN6FoueysMIYd+1PmH9UBB1d8649vX0btCMDvtS2kgsQpwkvrozf8x23AmRLKRtzI8r
+fEYGqT1Q/0hH39X+ll7q4exlBJQCPBKNtkfKE9citb+vuKdL8WBDUFAFMLZye4zPPBQNGQ
++NVPmQ1U93900j1TwRi1IyueCnG9m/WrugcJ23oslUzGCy86jaXK6s7FxKd4qKytcdZ4ps
+xgxQB8lpo8yJTTUbPhbU9XrYiPdZb2HkdA+zZTDcqU2X1hT12bd5Q4sryuwcevqc+J0lFd
+TQX1Zn7nqAjzO5EEXz5BqZrg1+s/Gxn0JGr0WZepwWB8hI+nWWUxxR8fPj96fpAaVP0F7w
+0enM0cC30A==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.aes192ctr
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczE5Mi1jdHIAAAAGYmNyeXB0AAAAGAAAABAKSOPnJ2
+50NgsNIIdHWVnnAAAABgAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgANkrBbRCho6BY5/QGBHF6G4h4GMDmDGj8GdFc5ksl8ij
+f3WoNzvDbCK05LoD4d2PhA6cxpVCDKdUYgr+z3wMk1uaXWSOpSuBUc+Wp5itgv7Na4WfSw
+BCWvQIbfxqcrwbOjxg9l0NdB/pyx50BazzVz/EnvXvXJTgG/esL9aPW3/GsYs/NAuiXz+t
+AWxIAg+HnHDASR2qva3EGREmMR+VUScM051ryxSVH4EC0OvVt9pnAxkCQbOjqmZdEif1xw
+iYiUhWCUH2J4vXXtA9kVkULP8jHQK5LESDBmn+YyetDWdBuveIPL8v82W3EGrH6vFruTc8
+TeA8iu1q61X1CzjVHEDcp1l4ar9FoVdr9gZ6igzOQPJ6gsK7y3bgmhysO+EjrF9DObU7i9
+juXyCu8VL2X49FhymkDgikcZY44z06L3kH9zkCgfTbkLHg8BnYZBg2G9DC4BTCwlwYpSkz
+kx9Iwz6/68VS2VKG4W/V3T7YBFCL+jJnrlSRSKbDiNIn6KsKYbrN4ah5p/M/i5JDlFYeNd
+fnkY7qZUv9RN+0WdrYglk5ctj+cyWjAuP4T9AagLfsslFnQwJLspxdg7Bha0Av4RGNuFLU
+zv+oizj0memSYD0U2puGrlsEcbkgdlWkm6h0g/jbrs4s6J+A00ammJNhIUHfV2fo6ZjgbC
+rvb1jOKM5g==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.aes256cbc
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABC2YyLP5U
+ZjVzWFYc+MKRNUAAAACAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgCD1OWnjPG1ng03glPWo2IU0R1AqgmCzVfF8JbON8cMdf
+qSP+VeRAjwbO5UPvo35IQxcKAA9w2w7t07YjzfBtDZL8np96SNXDY3217HrA/5frgXzF/j
+QeeNKSTcrmcsaCbzK23gQR5+Higbr51U2gmlpzNq4LVUrWI6/Vui25b1OB0O50Jghb4rDr
+sEyReoB9gEK0k0K0efsIze4vkfO9YWgZf21wtbCv9exc/Ro6wjD0FPN0DK0W/DxrV+SVuQ
+sLr45bYP1X4eErfQjooL6Wuvp2lbW3qzd26+qsDBuBpjwrOgvwJsiKZPp5lxoirAq6edRl
+6XWIO8zsb0YDDU2TTcZZ4gKL4NOZo3pB5bcob9FoF4VErT11D3kJkzdDRk2JxrBFWWXjVM
+3qtoxU6Fvsg7eXqTVcyGjReJrHxaamfHNmZsztD5u+R5R+h6Dy2GQeL/tBb/IEWYojvcv5
+WjH8PDMVJIPHzHIVXFdmLbTVhveZZbgSM6f4OOMmj63xfGosbG53qu+TIHUwofcZGJKjW2
+iCfNA9XSrM+CGVgQuE4ymu7+Nz6bHRv9J+PV8CeVvZQpXiHx5TcbthG2nApBZYTYbeMq+V
+jxrj6yppVz+OAzmjL98es4RknmjFGx6TGtdc4jHkqRbNdJ4jnnE3/4S7VraXqIXvLRQJTa
+frbkjh/H7Q==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.aes256ctr
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDqhox2Aa
+xvsCVAOt2yAEvbAAAACAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgDJ7AXoE6R3G/fIOveKKT8pGR1m/Aok3Kpf4bEDJsyEp/
+AOGEM2ncV+PYBTHBhTnCozHEc7rLuFmZPc6ipsuiCwjhTYIRXd50xmX3LUeQQciSMAg9Xg
+QbAQeRGipuQ+M24aPwfWULnmTXd6zyA0vNr+kVMI5ykMDfxlcsXgTC/4XCUSV535UqoVvM
+P+Iv7spuyXoRCFG49/H9FFw5L6BIbH2DJoQuNOp+s3vH0MewiFCTwYjTMzm9H48f5Sbcy3
+mn4Feswv6Xp2azsh/FzvjhsMG6nzpUroc0uJMuLu0oK+qgENWbsAqLuudlNlLqLNIlCe5C
+0qNdb78NtaDC9WiOjFNCGRWwUcKsGMO7mLaaox8D0l4ZveZbVJekXLGC/HWMc3ZwQUrcps
+V9ObK50R1sDWNz6DSfrYnzszkoGgqa3uqDBi+5dAuKBMV4wONfLFOhV3gUDuYnKVLJzHfB
+yIN/c23FJHgViH77O37Lyph9oRwWlVNbmA0/1aUeCPiunaq7O1u3MKCYrBlzpUQcyuFwVG
+FcemaJphpw41VCwS/VWKbXneMFc4jcSrbkRPzzWfZWmnsLgXZDPkXt6CPueCgS5sJlPgaO
+qAqAJQws9aC0xNYgYLObLpK4AdVx4Nc7ueBfJt2JfzryYgHO8y9asaWxNYuCBKoY3PXaLg
+Yjr0ht3wDA==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.bad-cipher1
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmJhZC1jaXBoZXIAAAAGYmNyeXB0AAAAGAAAABBLGHQHOJ
+KRBd56ffllc5abAAAABAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgAqISlkO/k85bkNoO2OHi7FR0mHs/8hAZbENWsOn2EJEt
+3YY4tMvDXDF7sL+0IsS99rPY2qKgCVnkipRPvMXM0TDCIGzT+ivg8fDmGCTnI+jVa76bGd
+hxroADQRgA6fNtS/zkVwRjUN7u9zHiXnJMYSJtX6k2bJBDOgvpkbM48gT9qdQrmR/8d8nx
+aITbz11/MBrTc+/xMIQLC+9aN7AWTCjgtxxG9mKZSm++MMF8/fIvQx0OjX5xcSI/y18L3d
+Mc1tCcBAb22jKJPWGrfqqAOS69eH7m2l0oAECvdwJecf/gwV+VdYNOBoBEQzZW2tAE2N3c
+HUi0+WY9ZQUPtVugHfqnu2PjNx+CmVCrV5Exy9+1RdbZjnf1euTC9TktH4GLalCp4nMHdp
+fBmhK0MtEBG4ldw2aX2UoGgcTLjuF0ctEdaEQsgOiKCLsNLg88iUFXYoOMzL9rIx1/QUYh
+TYaBGRhR04ogWiPpqawUOIRU4E5wSeo0daBGUS59+Drt8WD1Z1GsABGwRDj66qsQ4VTvrB
+S/HN05qDUYeXx2XjVsugnWPf0XJyloh5C/8O7bTG1KQaCPKJ1vCk0pjfL+ZMbyH98Zl0qb
+X6sWncXebL+Jg1agQbps7UideuIO+Ug6NQ4b1IRCET+ae7SLEUDMjqpta2uSc/47FJ99d7
+1FCTFT1UNQ==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.bad-cipher2
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACWFlczEyOC1jYgAAAAZiY3J5cHQAAAAYAAAAEEsYdAc4kp
+EF3np9+WVzlpsAAAAEAAAAAQAAAJcAAAAHc3NoLXJzYQAAAAMBAAEAAACBANZItDNTO/nR
+SeLOETUU0qt2DLn3CPbUMt2EAvJk0RmWl9kv17hxXbsDLDIryj4H6AYX9Mbd+iZIEghIUf
+h9QNc9xHGTlRIDixk6O2Gf0G0Ks5KCQnHpjFv7nlM+Y1jGV0HxvWGYI1E2fAwpRAKaX+5A
+4I+baK5aANKV8hrTt5rjAAACACohKWQ7+TzluQ2g7Y4eLsVHSYez/yEBlsQ1aw6fYQkS3d
+hji0y8NcMXuwv7QixL32s9jaoqAJWeSKlE+8xczRMMIgbNP6K+Dx8OYYJOcj6NVrvpsZ2H
+GugANBGADp821L/ORXBGNQ3u73MeJeckxhIm1fqTZskEM6C+mRszjyBP2p1CuZH/x3yfFo
+hNvPXX8wGtNz7/EwhAsL71o3sBZMKOC3HEb2YplKb74wwXz98i9DHQ6NfnFxIj/LXwvd0x
+zW0JwEBvbaMok9Yat+qoA5Lr14fubaXSgAQK93Al5x/+DBX5V1g04GgERDNlba0ATY3dwd
+SLT5Zj1lBQ+1W6Ad+qe7Y+M3H4KZUKtXkTHL37VF1tmOd/V65ML1OS0fgYtqUKnicwd2l8
+GaErQy0QEbiV3DZpfZSgaBxMuO4XRy0R1oRCyA6IoIuw0uDzyJQVdig4zMv2sjHX9BRiFN
+hoEZGFHTiiBaI+mprBQ4hFTgTnBJ6jR1oEZRLn34Ou3xYPVnUawAEbBEOPrqqxDhVO+sFL
+8c3TmoNRh5fHZeNWy6CdY9/RcnKWiHkL/w7ttMbUpBoI8onW8KTSmN8v5kxvIf3xmXSptf
+qxadxd5sv4mDVqBBumztSJ164g75SDo1DhvUhEIRP5p7tIsRQMyOqm1ra5Jz/jsUn313vU
+UJMVPVQ1
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.bad-crypt
^
|
@@ -0,0 +1,17 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczEyOC1jYmMAAAAGeGNyeXB0AAAAGAAAABBLGHQHOJ
+KRBd56ffllc5abAAAABAAAAAEAAACXAAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv5
+0UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISF
+H4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/u
+QOCPm2iuWgDSlfIa07ea4wAAAgAqISlkO/k85bkNoO2OHi7FR0mHs/8hAZbENWsOn2EJEt
+3YY4tMvDXDF7sL+0IsS99rPY2qKgCVnkipRPvMXM0TDCIGzT+ivg8fDmGCTnI+jVa76bGd
+hxroADQRgA6fNtS/zkVwRjUN7u9zHiXnJMYSJtX6k2bJBDOgvpkbM48gT9qdQrmR/8d8nx
+aITbz11/MBrTc+/xMIQLC+9aN7AWTCjgtxxG9mKZSm++MMF8/fIvQx0OjX5xcSI/y18L3d
+Mc1tCcBAb22jKJPWGrfqqAOS69eH7m2l0oAECvdwJecf/gwV+VdYNOBoBEQzZW2tAE2N3c
+HUi0+WY9ZQUPtVugHfqnu2PjNx+CmVCrV5Exy9+1RdbZjnf1euTC9TktH4GLalCp4nMHdp
+fBmhK0MtEBG4ldw2aX2UoGgcTLjuF0ctEdaEQsgOiKCLsNLg88iUFXYoOMzL9rIx1/QUYh
+TYaBGRhR04ogWiPpqawUOIRU4E5wSeo0daBGUS59+Drt8WD1Z1GsABGwRDj66qsQ4VTvrB
+S/HN05qDUYeXx2XjVsugnWPf0XJyloh5C/8O7bTG1KQaCPKJ1vCk0pjfL+ZMbyH98Zl0qb
+X6sWncXebL+Jg1agQbps7UideuIO+Ug6NQ4b1IRCET+ae7SLEUDMjqpta2uSc/47FJ99d7
+1FCTFT1UNQ==
+-----END OPENSSH PRIVATE KEY-----
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024-passphrase.pub
^
|
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDWSLQzUzv50UnizhE1FNKrdgy59wj21DLdhALyZNEZlpfZL9e4cV27AywyK8o+B+gGF/TG3fomSBIISFH4fUDXPcRxk5USA4sZOjthn9BtCrOSgkJx6Yxb+55TPmNYxldB8b1hmCNRNnwMKUQCml/uQOCPm2iuWgDSlfIa07ea4w== Test
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024.bin
^
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1024.pub
^
|
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCgbZKbmn3OMXCThMg80ZXO4WyeA4hgVOc6tovdtYIB8Y6lpKdGBa9i/L3Ye0+kSaALHJkwxxN3lYuHqRd1n5RvjEEr6CTDaPkeJy8lMJrs9AkHEaC2CgVG+2lNRuM2r9wGRTJ1fS7Nfs20fexzjd1wq1h4dsYZjmd6VxgK5RTPHw== Test
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1500
^
|
@@ -0,0 +1,21 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAA0gAAAAdzc2gtcn
+NhAAAAAwEAAQAAALwPTLccBGe6V9loHEOWBnrjghacDXNkAKb0nrvI5z1L/eNKXQpRFc7C
+I1uGP94LlZ89UvqKlFJg8TcbvNTdBrkfKIqG8HUIHuKsEOaRo9AjpJ9zTBQneUvdszkV4l
+2t6fPT5Edo/72WMijyYKuz7YpQkPXXRqFc2vw+W2qpUCjQoNbQcXYQ/Ii9HfhE+YzRnWJ8
+14gXmBPsnSDsrTnh3lrLsInDka4uUGIuq7PefD4eULixQQxUQxwzt2gsSwAAAsj6+GQS+v
+hkEgAAAAdzc2gtcnNhAAAAvA9MtxwEZ7pX2WgcQ5YGeuOCFpwNc2QApvSeu8jnPUv940pd
+ClEVzsIjW4Y/3guVnz1S+oqUUmDxNxu81N0GuR8oiobwdQge4qwQ5pGj0COkn3NMFCd5S9
+2zORXiXa3p89PkR2j/vZYyKPJgq7PtilCQ9ddGoVza/D5baqlQKNCg1tBxdhD8iL0d+ET5
+jNGdYnzXiBeYE+ydIOytOeHeWsuwicORri5QYi6rs958Ph5QuLFBDFRDHDO3aCxLAAAAAw
+EAAQAAALwIPBhKYiyaZXJE0QGnnDFEht44fBzhdGBoRY95IM0jO7G8crt8zSoN4A4BAhs3
+TP76eNEVCaQVPX+V1FsV4+p71MxKuN2k00rZpfcT6IG8zXxtCEPIw0aMO0y8dKxLDcLE3O
+OusCxUyqRm30ju9caEuQiTYG+1f2tJeDyx7B0qYqWjUL07nKO1EgSZEVpUVMsNw167RBo2
+j0unLf4Sz+KM+6r98phm9lx8v06wlgqTc4TKbz0XkMfW1LZuUQAAAF4x9wO6Ip2zbzXimT
+vXuxXSfUWg9RRHr8oviY4ZoCmvtWcr7ZG8mvD3zrZy1LvNt0uqT4f1PurYN3KkAY6aqwBo
+84UrhpR2b/YVfNwRX7tUKP8Mq6pkc9M0TRS9zDTvAAAAXj9vipwpr0zHJkCG83Y2IvMj6c
++6GPlLppZtsemkIHZazdGEPxKPXKj+JtgJtzpGct5vqFNblTyg9TLZwP1RZ1iX3r+LiBgL
+L+2eMuMp2OfqTioErFP1/g4k4c0ugHcAAABePb45sfSBirSPvTI4QIx7z2kY+PYZA1vaLy
+CIjtGYA1auFmbrBtl+RgwijCwLrdyAG4s37RHa69ysiUBYXeAGavT7NT4WGiemISIL+8ft
+xQQ+8WrG9i1SlD8ZY8dbzQAAAARUZXN0
+-----END OPENSSH PRIVATE KEY-----
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1500.bin
^
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-1500.pub
^
|
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAvA9MtxwEZ7pX2WgcQ5YGeuOCFpwNc2QApvSeu8jnPUv940pdClEVzsIjW4Y/3guVnz1S+oqUUmDxNxu81N0GuR8oiobwdQge4qwQ5pGj0COkn3NMFCd5S92zORXiXa3p89PkR2j/vZYyKPJgq7PtilCQ9ddGoVza/D5baqlQKNCg1tBxdhD8iL0d+ET5jNGdYnzXiBeYE+ydIOytOeHeWsuwicORri5QYi6rs958Ph5QuLFBDFRDHDO3aCxL Test
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-2048
^
|
@@ -0,0 +1,27 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAQEAqHTgcF8nRm2Qf5jQvj9e5xW2nGFAnNu1kAmwhFnLfP/mTNsgLHw+
+vhd4JyWh/yLSuBF1EvZuYwvQHXEVUMJeqNj5br1bcnq2oprE3KLC/x+WgCQc4uDagsBJt1
+W5uTExHkPIZjdLMa7AOAQrxixQX2GyRZfxlLMgms0Vtm+9YxxpHKg4YC12f7F5Hb//Pbgz
+L2U4p1PPP9kHOiU8XA4cqP5L2feN33lUiycwlQE1EZVwJDR3pEtM29j0z0K3uNIa+QBm6i
+jXNQr/DiIiCtYGFcfkvSmOaujEEqtIqrkoPMYbCP4CfidP3wXMRfZ/6kl8ps8zzCf3dqb8
+7aIyh8CD7QAAA8AVQkl5FUJJeQAAAAdzc2gtcnNhAAABAQCodOBwXydGbZB/mNC+P17nFb
+acYUCc27WQCbCEWct8/+ZM2yAsfD6+F3gnJaH/ItK4EXUS9m5jC9AdcRVQwl6o2PluvVty
+eraimsTcosL/H5aAJBzi4NqCwEm3Vbm5MTEeQ8hmN0sxrsA4BCvGLFBfYbJFl/GUsyCazR
+W2b71jHGkcqDhgLXZ/sXkdv/89uDMvZTinU88/2Qc6JTxcDhyo/kvZ943feVSLJzCVATUR
+lXAkNHekS0zb2PTPQre40hr5AGbqKNc1Cv8OIiIK1gYVx+S9KY5q6MQSq0iquSg8xhsI/g
+J+J0/fBcxF9n/qSXymzzPMJ/d2pvztojKHwIPtAAAAAwEAAQAAAQANvuO60k4zyqhE0SUP
+W7+/CXWKKHa2QJ39xTH4dWn2UYdASY0ZiYCGewccjU89BgwTEFGbnNeAZiwINacF8lD5Ds
+4OVuM0YduvRFkV9oNaKqtZhMOFUSW4uj9e917H7sH8SeRQpZMRgxnqODo+LyArzZ6ssRZP
+CkLPKYxBA7h8yBMhNgX/yA946/lO0mmfEQbNtJJ1F7hfQ0hi6yvR9O/FQGzGjFgPYYcHLJ
+4p3dRvz3ZSjvDmnt6Qn9lx4VXgxD+TiHPEYaZHsINiWa0wv/DVsJ3AKvDU08mbUNi/LFHA
+xDtEl5lO8nY4QUE+wV6smDSUQc7XVJL69ojmXm9rBTzBAAAAgEJwVaPh9ZPcxB7W9VQUM5
++/qlejtPFeaksz7cEGr/Db2fJJKiIwU6GjnKg9mzvJcSQA9O+BD5uEtVwLOe3+83RkC2Ky
+PDfh+aEwKk1tdYdqyCFvIpAxzpJCNX1jt1BZj+DjfFb84Wor4Q9FPJf88HXpqWOq41Qxk7
+9h1+f5yTlnAAAAgQDUqowXyZYZRm4VOTd43qoM/5jaUJ6tedvrhTgBk4vkNxFvkobANV1R
+ik99HhZNqcu/DJlzgBVDhhXg6uaE3a49afHkrbPTGRkb95gTv8WHK2ZTSxaa5Li2sByVU6
+64kH+O+3JWiU3xMWuX3M8nhBENsVVdYqO/5dIwl0FjC4rS0QAAAIEAysgw8PcxWqfK82u4
+KuXs+wUD6E3TrvqNUEKE9l50EEm0Nh5w6vmUY3pz569XnwZ0TIN2iD1OgXwB4bAcchK+nf
+rs55Z3mfI6FuhG1aQZTtq8zkjS3hbC7sY4Rhi9s7XBPVxhT3Ffm+tNQGThMXc0XzwlvSU7
+Z+PdBc24qiPCjl0AAAAEVGVzdAECAwQFBgc=
+-----END OPENSSH PRIVATE KEY-----
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-2048.bin
^
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-2048.pub
^
|
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCodOBwXydGbZB/mNC+P17nFbacYUCc27WQCbCEWct8/+ZM2yAsfD6+F3gnJaH/ItK4EXUS9m5jC9AdcRVQwl6o2PluvVtyeraimsTcosL/H5aAJBzi4NqCwEm3Vbm5MTEeQ8hmN0sxrsA4BCvGLFBfYbJFl/GUsyCazRW2b71jHGkcqDhgLXZ/sXkdv/89uDMvZTinU88/2Qc6JTxcDhyo/kvZ943feVSLJzCVATURlXAkNHekS0zb2PTPQre40hr5AGbqKNc1Cv8OIiIK1gYVx+S9KY5q6MQSq0iquSg8xhsI/gJ+J0/fBcxF9n/qSXymzzPMJ/d2pvztojKHwIPt Test
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-3072
^
|
@@ -0,0 +1,38 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABlwAAAAdzc2gtcn
+NhAAAAAwEAAQAAAYEAsPy/F+h32OGHRwnBiuemAUD4NDHxJE96EFy+rlztBV7DI+IkW2UV
+GZ6F2o+0k6U9Jpl0YqGugPVyXkJbngPKbuiFEkonMthCEM4vT7rd1a4RmAr51GCxSJ/Ntl
+5+D01FTt16c/th5/44pB/xwib4L242k8qAyJMYHh8/eEBFqS5lJl6/vRZT8KOHsFuW3Nn4
+/F4kgk3+1CGL1nu68pVmjGgIMBUl/8zV+o0TuKr2TkmM+t2ZJwF8DOySAmDl5h72YGl+5a
+RoUTVExVqsdC4Zks+IFJ5b0GU/Qg0kfOJW7NlzctV9HkityWxpDB5Ft2HhFOa8ndSJaHhD
+Jfs3tUl2yGSG1vydxcvLftuj4pUfDk5tauW2YUFGvU57tIzX2zDlQzE3n1E47Dls3UMhoX
+JItpK1TD8WieeFvlI0aajuveAp4Z0iao+K+//89qmgTsiUFMazqUh75dk9ZyW5zf/eqCrl
+W662UecA+IMiD0GxBsDfl5DcNhBMBQcyYAcT+e3jAAAFgA/FTlcPxU5XAAAAB3NzaC1yc2
+EAAAGBALD8vxfod9jhh0cJwYrnpgFA+DQx8SRPehBcvq5c7QVewyPiJFtlFRmehdqPtJOl
+PSaZdGKhroD1cl5CW54Dym7ohRJKJzLYQhDOL0+63dWuEZgK+dRgsUifzbZefg9NRU7den
+P7Yef+OKQf8cIm+C9uNpPKgMiTGB4fP3hARakuZSZev70WU/Cjh7BbltzZ+PxeJIJN/tQh
+i9Z7uvKVZoxoCDAVJf/M1fqNE7iq9k5JjPrdmScBfAzskgJg5eYe9mBpfuWkaFE1RMVarH
+QuGZLPiBSeW9BlP0INJHziVuzZc3LVfR5IrclsaQweRbdh4RTmvJ3UiWh4QyX7N7VJdshk
+htb8ncXLy37bo+KVHw5ObWrltmFBRr1Oe7SM19sw5UMxN59ROOw5bN1DIaFySLaStUw/Fo
+nnhb5SNGmo7r3gKeGdImqPivv//PapoE7IlBTGs6lIe+XZPWcluc3/3qgq5VuutlHnAPiD
+Ig9BsQbA35eQ3DYQTAUHMmAHE/nt4wAAAAMBAAEAAAGAG0Y/3pvVCEetFK30tQbAxtWvyj
+9eBXX3/hiEzBMG9bpmQRvi9XCs4T9UKlvV/KDMvSuNy3tWDIqGnu8D9mRoKFJN24Uw6D16
+ZOOZV+SYtgq2rGMYn/lsqJ/z0CRcsdf7E82+xqvZKSq8qNJBa+Wcfpax83GUChTc9RtkqQ
+/ijFFZhiG405dixSU2Tl+27n7qx11sq+YAHMm0po93vlV2sbGAfYRs0DBNU2i1PtKd1W+x
+OaG3rdKlPsqgL5ymISHpHOt8grlB3eMgCQO8EM9fTZbjtJyuP2mYZnx0iV0JqLxdCGiZBp
+X2S26c5mAgzLCvBKVOHgdIHWepVwACxmsdCJsV3Nue+6xA74oTPCtqI5UT1QgSsfPH8Sfr
+BShpOTKZstsz5xrUOtpE3CDiFh7HlhZjNZi7+1pxeo2RycRYIU43MWL5iA54fynLVO5B0f
+OpUYKqCC7VbuZDuyx85vm2sIGHw2j674WPSsIrJ2hFL6ucVuw/xJE4VXo9QpK2bEExAAAA
+wQDRntngUd4ecgDc0Fmi9VhEwkp1EcVBPuw32ed1p28ouV/HN7f/6Sbf3NXkCPd6nBBOK3
+Y2eHkGNGNJVeSH3dmOIuB8iT2ZC7Gw/tfM332KU2+QaPZ4jl1K/OKST1MHnhfnAuYvVL08
+gtrnMrJuUXOvMS2omt9rwMVAkGsi7K8owerePnpRUKFYv1HSgSrqYqy1E1B6ky4lyJzE30
+eKRtBQH/ttIlv3z/PSQ9ib111+/wBQyzQdHjGMbhu4KXiEjl4AAADBAO4FIpGucfDr9A8J
+Chpq5fTUv666MYwgrEVckAwv58jDAB6RNIWyFwUPBkiTIzjPRD72Z4y5b7JIHA2OcOs9wF
+dKwKUHquo4dIeBDLjf4snDeBW53Q6VYTAmA3dDzo7rsWQUrdCRBz/jA77RBZtTtreWoIWY
+WohwmHyZWoZWA5YyrRqbXKNNhD6qRG7xDIapImveVkGaRjwIMttPB5kowW3thPsAl121E8
++XuCm117ijETDHrJW3gBiExtTFezhR0QAAAMEAvltZ7WJY5jlsl1mHKfvGaDmJVSokJ85o
+Ux3hAgBXCnxhPJNvCAR2Qt2CrVAR6K3RdkfdPUbl1Ss0JTq1KWGxjooD16fevJ6xWVkgQ0
+4wV3jct5ygzzStEMEyxZhDi12NQvi6Xb6TcpukiWhBo9L3HJqv+xwn8nKo8cydHu0F5+GW
+/z/Z9FOD09lW30HhQH/8oyq2LUUaITZaXjUDaLLtD6ZfdDeV/K/IbD6LQJ9wuL8+/tuSLu
+cz9XfRlhSXgJ1zAAAABFRlc3QBAgMEBQY=
+-----END OPENSSH PRIVATE KEY-----
|
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-3072.bin
^
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/data/openssh-3072.pub
^
|
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw/L8X6HfY4YdHCcGK56YBQPg0MfEkT3oQXL6uXO0FXsMj4iRbZRUZnoXaj7STpT0mmXRioa6A9XJeQlueA8pu6IUSSicy2EIQzi9Put3VrhGYCvnUYLFIn822Xn4PTUVO3Xpz+2Hn/jikH/HCJvgvbjaTyoDIkxgeHz94QEWpLmUmXr+9FlPwo4ewW5bc2fj8XiSCTf7UIYvWe7rylWaMaAgwFSX/zNX6jRO4qvZOSYz63ZknAXwM7JICYOXmHvZgaX7lpGhRNUTFWqx0LhmSz4gUnlvQZT9CDSR84lbs2XNy1X0eSK3JbGkMHkW3YeEU5ryd1IloeEMl+ze1SXbIZIbW/J3Fy8t+26PilR8OTm1q5bZhQUa9Tnu0jNfbMOVDMTefUTjsOWzdQyGhcki2krVMPxaJ54W+UjRpqO694CnhnSJqj4r7//z2qaBOyJQUxrOpSHvl2T1nJbnN/96oKuVbrrZR5wD4gyIPQbEGwN+XkNw2EEwFBzJgBxP57eM= Test
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoil/test_key_rsa/test_key_rsa.c
^
|
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2022 by Slava Monich <slava@monich.com>
+ * Copyright (C) 2016-2023 Slava Monich <slava@monich.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -283,7 +283,9 @@
g_assert(pub);
g_assert(priv);
g_assert(!foil_key_equal(pub, bad_pub));
+ g_assert(!foil_key_equal(bad_pub, pub));
g_assert(!foil_private_key_equal(priv, bad_priv));
+ g_assert(!foil_private_key_equal(bad_priv, priv ));
/* Missing destination */
g_assert(!foil_private_key_encrypt(priv, NULL, 0, NULL, NULL, NULL));
@@ -446,7 +448,7 @@
/* PKCS1 is the default RSA private key format */
bytes = foil_key_to_binary_format(priv_key,
- FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1);
+ FOIL_KEY_BINARY_FORMAT_RSA_PKCS1);
g_assert(g_bytes_equal(bytes, priv_data));
g_bytes_unref(bytes);
@@ -464,7 +466,7 @@
/* Test non-default PKCS #1 RSA public key format */
g_bytes_unref(pub_data);
pub_data = foil_key_to_binary_format(keys.pub,
- FOIL_KEY_EXPORT_FORMAT_RSA_PKCS1);
+ FOIL_KEY_BINARY_FORMAT_RSA_PKCS1);
pub2 = foil_key_new_from_bytes(FOIL_KEY_RSA_PUBLIC, pub_data);
g_assert(pub2);
@@ -634,6 +636,91 @@
test_key_rsa_keys_deinit(&keys);
}
+static
+void
+test_key_rsa_private_export(
+ gconstpointer param)
+{
+ const TestKeyRsa* test = param;
+ TestKeyRsaKeys keys;
+ char* exported;
+ FoilPrivateKey* imported;
+
+ test_key_rsa_keys_init(&keys, test);
+ exported = foil_private_key_to_string(keys.priv, test->param, "Test");
+ GDEBUG("%s", exported);
+ imported = foil_private_key_new_from_string(FOIL_KEY_RSA_PRIVATE,
+ exported);
+ g_assert(imported);
+ g_assert(foil_private_key_equal(keys.priv, imported));
+ foil_private_key_unref(imported);
+ test_key_rsa_keys_deinit(&keys);
+ g_free(exported);
+}
+
+static
+void
+test_key_rsa_private_bytes(
+ gconstpointer param)
+{
+ const TestKeyRsa* test = param;
+ TestKeyRsaKeys keys;
+ FoilPrivateKey* key;
+ GBytes* binary;
+
+ test_key_rsa_keys_init(&keys, test);
+ binary = foil_key_to_binary_format(FOIL_KEY(keys.priv), test->param);
+ GDEBUG("Binary form (%u bytes):", (guint)g_bytes_get_size(binary));
+ TEST_DEBUG_HEXDUMP_BYTES(binary);
+ g_assert_cmpuint(g_bytes_get_size(binary), > ,0);
+
+ key = foil_private_key_new_from_bytes(FOIL_KEY_RSA_PRIVATE, binary);
+ g_assert(foil_private_key_equal(keys.priv, key));
+
+ g_bytes_unref(binary);
+ foil_private_key_unref(key);
+ test_key_rsa_keys_deinit(&keys);
+}
+
+static
+void
+test_key_rsa_private_encrypt(
+ gconstpointer param)
+{
+ const TestKeyRsa* test = param;
+ const char* password = test->data;
+ TestKeyRsaKeys keys;
+ char* encrypted;
+ FoilPrivateKey* decrypted;
+ GError* error = NULL;
+
+ test_key_rsa_keys_init(&keys, test);
+ encrypted = foil_private_key_encrypt_to_string(keys.priv, test->param,
+ password, "Test");
+ GDEBUG("%s", encrypted);
+
+ /* Password is required */
+ decrypted = foil_private_key_decrypt_from_string(FOIL_KEY_RSA_PRIVATE,
+ encrypted, NULL, &error);
+ g_assert(!decrypted);
+ g_assert(error->domain == FOIL_ERROR);
+ g_assert(error->code == FOIL_ERROR_KEY_ENCRYPTED);
+
+ decrypted = foil_private_key_decrypt_from_string(FOIL_KEY_RSA_PRIVATE,
+ encrypted, "", &error);
+ g_assert(!decrypted);
+ g_assert(error->domain == FOIL_ERROR);
+ g_assert(error->code == FOIL_ERROR_KEY_ENCRYPTED);
+
+ decrypted = foil_private_key_decrypt_from_string(FOIL_KEY_RSA_PRIVATE,
+ encrypted, password, &error);
+ g_assert(decrypted);
+
+ g_assert(foil_private_key_equal(keys.priv, decrypted));
+ foil_private_key_unref(decrypted);
+ test_key_rsa_keys_deinit(&keys);
+ g_free(encrypted);
+}
static
void
@@ -880,12 +967,15 @@
}
#define TEST_(name) "/key_rsa/" name
-#define TEST_READ_OK(type,name) TEST_READ_OK2(type,name,"")
+#define TEST_READ_OK(type,name) TEST_READ_OK3(type,name,"")
#define TEST_READ_OK1(type,name) \
{ TEST_("read-" name), test_key_rsa_##type##_read_ok, \
name }
#define TEST_READ_OK2(type,name,suffix) \
{ TEST_("read-" name suffix), test_key_rsa_##type##_read_ok, \
+ name, name ".bin" }
+#define TEST_READ_OK3(type,name,suffix) \
+ { TEST_("read-" name suffix), test_key_rsa_##type##_read_ok, \
name suffix, name ".bin" }
#define TEST_ENCRYPT(name, password, comment) \
{ TEST_("encrypt-" name), test_key_rsa_encrypt, \
@@ -896,6 +986,9 @@
#define TEST_READ_PASSPHRASE_ERR(name,enc,passphrase,err) \
{ TEST_("read-" name "-" enc), test_key_rsa_passphrase_read_err, \
name "." enc, NULL, passphrase, FOIL_ERROR_##err }
+#define TEST_READ_PASSPHRASE_ERR1(name,enc,suffix,passphrase,err) \
+ { TEST_("read-" name "-" enc suffix), test_key_rsa_passphrase_read_err, \
+ name "." enc, NULL, passphrase, FOIL_ERROR_##err }
#define TEST_READ_RFC4716_OK(type,name) \
{ TEST_("read-" name ".RFC4716"), test_key_rsa_##type##_read_ok, \
name ".RFC4716", name ".bin" }
@@ -905,6 +998,9 @@
#define TEST_READ_ERR(type,name) \
{ TEST_("read-" name), test_key_rsa_##type##_read_err, \
name }
+#define TEST_READ_ERR1(type,name,suffix) \
+ { TEST_("read-" name suffix), test_key_rsa_##type##_read_err, \
+ name }
#define TEST_FINGERPRINT(name) \
{ TEST_("fingerprint-" name), test_key_rsa_fingerprint, \
name, name ".pub" }
@@ -914,6 +1010,16 @@
#define TEST_CONVERT(name) \
{ TEST_("convert-" name), test_key_rsa_convert, \
name, name ".pub" }
+#define TEST_PRIVATE_EXPORT(name,suffix,format) \
+ { TEST_("private-export-" name "-" suffix), test_key_rsa_private_export, \
+ name, name ".pub", NULL, FOIL_KEY_EXPORT_FORMAT_##format }
+#define TEST_PRIVATE_BYTES(name,suffix,format) \
+ { TEST_("private-bytes-" name "-" suffix), test_key_rsa_private_bytes, \
+ name, name ".pub", NULL, FOIL_KEY_BINARY_FORMAT_##format }
+#define TEST_PRIVATE_ENCRYPT(name, suffix, format) \
+ { TEST_("private-export-encrypted-" name "-" suffix), \
+ test_key_rsa_private_encrypt, name, name ".pub", "password", \
+ FOIL_KEY_EXPORT_FORMAT_##format }
#define TEST_BYTES(name) \
{ TEST_("bytes-" name), test_key_rsa_bytes, \
name, name ".pub" }
@@ -944,11 +1050,19 @@
TEST_READ_OK(private, "rsa-1024" ),
TEST_READ_OK(private, "rsa-1500" ),
TEST_READ_OK(private, "rsa-2048" ),
+ TEST_READ_OK3(private, "rsa-768", ".1" ),
+ TEST_READ_OK(private, "openssh-1024" ),
+ TEST_READ_OK(private, "openssh-1500" ),
+ TEST_READ_OK(private, "openssh-2048" ),
+ TEST_READ_OK(private, "openssh-3072" ),
TEST_READ_OK(public, "rsa-768.pub" ),
TEST_READ_OK(public, "rsa-1024.pub" ),
TEST_READ_OK(public, "rsa-1500.pub" ),
TEST_READ_OK(public, "rsa-2048.pub" ),
- TEST_READ_OK2(private, "rsa-768", ".1" ),
+ TEST_READ_OK2(public, "openssh-1024", "-public" ),
+ TEST_READ_OK2(public, "openssh-1500", "-public" ),
+ TEST_READ_OK2(public, "openssh-2048", "-public" ),
+ TEST_READ_OK2(public, "openssh-3072", "-public" ),
TEST_ENCRYPT("rsa-768", NULL, NULL),
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/foil/test/libfoilmsg/test_foilmsg/test_foilmsg.c
^
|
@@ -550,6 +550,11 @@
FOILMSG_CIPHER_AES_CFB, FOILMSG_SIGNATURE_DEFAULT
};
+static const FoilMsgEncryptOptions options_aes_128_ctr_self = {
+ FOILMSG_KEY_AES_128, FOILMSG_FLAG_ENCRYPT_FOR_SELF,
+ FOILMSG_CIPHER_AES_CTR, FOILMSG_SIGNATURE_DEFAULT
+};
+
static const FoilMsgEncryptOptions options_aes_192_self = {
FOILMSG_KEY_AES_192, FOILMSG_FLAG_ENCRYPT_FOR_SELF,
FOILMSG_CIPHER_AES_CBC, FOILMSG_SIGNATURE_DEFAULT
@@ -557,7 +562,12 @@
static const FoilMsgEncryptOptions options_aes_192_cfb_self = {
FOILMSG_KEY_AES_192, FOILMSG_FLAG_ENCRYPT_FOR_SELF,
- FOILMSG_CIPHER_AES_CBC, FOILMSG_SIGNATURE_DEFAULT
+ FOILMSG_CIPHER_AES_CFB, FOILMSG_SIGNATURE_DEFAULT
+};
+
+static const FoilMsgEncryptOptions options_aes_192_ctr_self = {
+ FOILMSG_KEY_AES_192, FOILMSG_FLAG_ENCRYPT_FOR_SELF,
+ FOILMSG_CIPHER_AES_CTR, FOILMSG_SIGNATURE_DEFAULT
};
static const FoilMsgEncryptOptions options_aes_256_self = {
@@ -567,7 +577,12 @@
static const FoilMsgEncryptOptions options_aes_256_cfb_self = {
FOILMSG_KEY_AES_256, FOILMSG_FLAG_ENCRYPT_FOR_SELF,
- FOILMSG_CIPHER_AES_CBC, FOILMSG_SIGNATURE_DEFAULT
+ FOILMSG_CIPHER_AES_CFB, FOILMSG_SIGNATURE_DEFAULT
+};
+
+static const FoilMsgEncryptOptions options_aes_256_ctr_self = {
+ FOILMSG_KEY_AES_256, FOILMSG_FLAG_ENCRYPT_FOR_SELF,
+ FOILMSG_CIPHER_AES_CTR, FOILMSG_SIGNATURE_DEFAULT
};
static const FoilMsgEncryptOptions options_aes_256_sha1_rsa = {
@@ -622,6 +637,11 @@
{ "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
&options_aes_128_cfb_self
},{
+ TEST_("AESCTR/128bit"), test_foilmsg_text,
+ "Test of 128-bit encryption (CTR mode)",
+ { "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
+ &options_aes_128_ctr_self
+ },{
TEST_("AESCBC/192bit"), test_foilmsg_text,
"Test of 192-bit encryption",
{ "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
@@ -632,6 +652,11 @@
{ "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
&options_aes_192_cfb_self
},{
+ TEST_("AESCTR/192bit"), test_foilmsg_text,
+ "Test of 192-bit encryption (CTR mode)",
+ { "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
+ &options_aes_192_ctr_self
+ },{
TEST_("AESCBC/256bit"), test_foilmsg_text,
"Test of 256-bit encryption",
{ "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
@@ -642,6 +667,11 @@
{ "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
&options_aes_256_cfb_self
},{
+ TEST_("AESCTR/256bit"), test_foilmsg_text,
+ "Test of 256-bit encryption (CTR mode)",
+ { "rsa-768", "rsa-768.pub", "rsa-1024", "rsa-1024.pub" },
+ &options_aes_256_ctr_self
+ },{
TEST_("SelfDecrypt"), test_foilmsg_text,
"Sender should be able to decrypt this",
{ "rsa-768", "rsa-768.pub", "rsa-768", "rsa-1024.pub" },
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/harbour-lib/src/libcrypto.c
^
|
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
* Copyright (C) 2021-2023 Slava Monich <slava@monich.com>
+ * Copyright (C) 2021-2022 Jolla Ltd.
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -8,27 +8,29 @@
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "gutil_log.h"
@@ -41,6 +43,7 @@
#include <openssl/md5.h>
#include <openssl/rsa.h>
#include <openssl/sha.h>
+#include <openssl/modes.h>
/*
* What is this code?
@@ -112,8 +115,14 @@
(const unsigned char* in, unsigned char* out, const AES_KEY* key, \
const int enc), \
(in, out, key, enc)) \
+ f(AES_encrypt, (const unsigned char *in, unsigned char *out, \
+ const AES_KEY *key), (in, out, key)) \
f(BN_clear_free, (BIGNUM *a), (a)) \
f(BN_free, (BIGNUM *a), (a)) \
+ f(CRYPTO_ctr128_encrypt, (const unsigned char *in, unsigned char *out, \
+ size_t len, const void *key, unsigned char ivec[16], \
+ unsigned char ecount_buf[16], unsigned int *num, block128_f block), \
+ (in, out, len, key, ivec, ecount_buf, num, block)) \
f(DES_ede3_cbc_encrypt, \
(const unsigned char* input, unsigned char* output, long length, \
DES_key_schedule* ks1, DES_key_schedule* ks2, DES_key_schedule* ks3, \
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/LICENSE
^
|
@@ -1,4 +1,5 @@
Copyright (C) 2014-2022 Jolla Ltd.
+Copyright (C) 2023 Slava Monich <slava@monich.com>
You may use this file under the terms of BSD license as follows:
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/Makefile
^
|
@@ -15,15 +15,29 @@
all: debug release pkgconfig
#
+# Directories
+#
+
+SRC_DIR = src
+INCLUDE_DIR = include
+BUILD_DIR = build
+DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
+RELEASE_BUILD_DIR = $(BUILD_DIR)/release
+COVERAGE_BUILD_DIR = $(BUILD_DIR)/coverage
+
+#
# Library version
#
-VERSION_MAJOR = 1
-VERSION_MINOR = 0
-VERSION_RELEASE = 64
+VERSION_FILE = $(INCLUDE_DIR)/gutil_version.h
+get_version = $(shell grep -E '^ *\#define +GUTIL_VERSION_$1 +[0-9]+$$' $(VERSION_FILE) | sed 's/ */ /g' | cut -d ' ' -f 3)
+
+VERSION_MAJOR := $(call get_version,MAJOR)
+VERSION_MINOR := $(call get_version,MINOR)
+VERSION_MICRO := $(call get_version,MICRO)
# Version for pkg-config
-PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
+PCVERSION := $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
#
# Library name
@@ -35,7 +49,7 @@
LIB_SYMLINK1 = $(LIB_DEV_SYMLINK).$(VERSION_MAJOR)
LIB_SYMLINK2 = $(LIB_SYMLINK1).$(VERSION_MINOR)
LIB_SONAME = $(LIB_SYMLINK1)
-LIB = $(LIB_SONAME).$(VERSION_MINOR).$(VERSION_RELEASE)
+LIB = $(LIB_SONAME).$(VERSION_MINOR).$(VERSION_MICRO)
STATIC_LIB = $(LIB_NAME).a
#
@@ -43,6 +57,7 @@
#
SRC = \
+ gutil_datapack.c \
gutil_history.c \
gutil_idlepool.c \
gutil_idlequeue.c \
@@ -53,18 +68,9 @@
gutil_misc.c \
gutil_ring.c \
gutil_strv.c \
- gutil_timenotify.c
-
-#
-# Directories
-#
-
-SRC_DIR = src
-INCLUDE_DIR = include
-BUILD_DIR = build
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-COVERAGE_BUILD_DIR = $(BUILD_DIR)/coverage
+ gutil_timenotify.c \
+ gutil_version.c \
+ gutil_weakref.c
#
# Tools and flags
@@ -77,6 +83,8 @@
INCLUDES = -I$(INCLUDE_DIR)
BASE_FLAGS = -fPIC
FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \
+ -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \
-MMD -MP $(shell pkg-config --cflags $(PKGS))
FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) \
$(shell pkg-config --libs $(PKGS))
@@ -93,7 +101,7 @@
RELEASE_LDFLAGS = $(FULL_LDFLAGS) $(RELEASE_FLAGS)
DEBUG_CFLAGS = $(FULL_CFLAGS) $(DEBUG_FLAGS) -DDEBUG
RELEASE_CFLAGS = $(FULL_CFLAGS) $(RELEASE_FLAGS) -O2
-COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) --coverage
+COVERAGE_CFLAGS = $(FULL_CFLAGS) $(COVERAGE_FLAGS) -O0 --coverage
#
# Files
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/debian/changelog
^
|
@@ -1,3 +1,37 @@
+libglibutil (1.0.69) unstable; urgency=low
+
+ * Runtime and compile time version detection
+ * Added gutil_datapack module
+ * Require glib 2.32
+
+ -- Slava Monich <slava@monich.com> Thu, 06 Apr 2023 02:13:48 +0300
+
+libglibutil (1.0.68) unstable; urgency=low
+
+ * Added gutil_weakref module
+ * Fixed a few compilation warnings
+ * Packaging tweaks
+
+ -- Slava Monich <slava@monich.com> Sat, 04 Feb 2023 04:26:45 +0200
+
+libglibutil (1.0.67) unstable; urgency=low
+
+ * Added gutil_log_dump_bytes()
+
+ -- Slava Monich <slava.monich@jolla.com> Fri, 15 Jul 2022 03:02:33 +0300
+
+libglibutil (1.0.66) unstable; urgency=low
+
+ * Bumped debhelper compat level to 7
+
+ -- Slava Monich <slava.monich@jolla.com> Fri, 15 Jul 2022 03:02:33 +0300
+
+libglibutil (1.0.65) unstable; urgency=low
+
+ * Fixed a Musl compatibility issue
+
+ -- Slava Monich <slava.monich@jolla.com> Thu, 16 Jun 2022 02:12:22 +0300
+
libglibutil (1.0.64) unstable; urgency=low
* Resolved a mysterious parallel build issue
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/debian/compat
^
|
@@ -1 +1 @@
-5
+7
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/debian/control
^
|
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Slava Monich <slava.monich@jolla.com>
-Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0)
+Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.32)
Standards-Version: 3.8.4
Package: libglibutil
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/debian/copyright
^
|
@@ -1,4 +1,5 @@
Copyright (C) 2014-2022 Jolla Ltd.
+Copyright (C) 2023 Slava Monich <slava@monich.com>
You may use this file under the terms of BSD license as follows:
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/include/gutil_datapack.h
^
|
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GUTIL_DATAPACK_H
+#define GUTIL_DATAPACK_H
+
+#include "gutil_types.h"
+
+/*
+ * Utilities for packing and unpacking simple data types and structures.
+ *
+ * Since 1.0.69
+ */
+
+G_BEGIN_DECLS
+
+/*
+ * Compact 7 bits per byte representation of a signed integer with
+ * redundant sign bits removed. Most significant bit is the continuation
+ * flag. Bit 0x40 in the first (most significant) byte is the sign bit.
+ * Unused bits in the most significant chunk must be filled with the
+ * sign bit.
+ *
+ * For positive numbers it's slightly less efficient than encoding unsigned
+ * numbers because of one extra sign bit (e.g. unsigned number 65 can be
+ * squeezed into a single byte but the signed one takes 2 bytes).
+ *
+ * Examples:
+ *
+ * 33 (0x0000000000000021) => 00100001 (0x21)
+ * -33 (0xffffffffffffffdf) => 01011111 (0x5f)
+ * 65 (0x0000000000000041) => 10000000 01000001 (0x80 0x41)
+ * -65 (0xffffffffffffff3f) => 11111111 00111111 (0xff 0x3f)
+ * 129 (0x0000000000000081) => 10000001 00000001 (0x81 0x01)
+ * -129 (0xffffffffffffff7f) => 11111110 01111110 (0xfe 0x7f)
+ */
+
+guint
+gutil_signed_mbn_size(
+ gint64 value);
+
+guint
+gutil_signed_mbn_encode(
+ gpointer buf,
+ gint64 value);
+
+guint
+gutil_signed_mbn_encode2(
+ gpointer buf,
+ gint64 value,
+ guint value_size);
+
+gboolean
+gutil_signed_mbn_decode(
+ GUtilRange* in,
+ gint64* out);
+
+gboolean
+gutil_signed_mbn_decode2(
+ const GUtilData* in,
+ gint64* out);
+
+/*
+ * Compact 7 bits per byte representation of an unsigned integer with
+ * redundant zero bits removed. Most significant bit is the continuation
+ * flag. Unused bits in the first byte (most significant chunk) must be
+ * filled with zeros.
+ *
+ * Examples:
+ *
+ * 33 (0x0000000000000021) => 00100001 (0x21)
+ * 65 (0x0000000000000041) => 01000001 (0x41)
+ * 129 (0x0000000000000081) => 10000001 00000001 (0x81 0x01)
+ */
+
+guint
+gutil_unsigned_mbn_size(
+ guint64 value);
+
+guint
+gutil_unsigned_mbn_encode(
+ gpointer buf,
+ guint64 value);
+
+guint
+gutil_unsigned_mbn_encode2(
+ gpointer buf,
+ guint64 value,
+ guint value_size);
+
+gboolean
+gutil_unsigned_mbn_decode(
+ GUtilRange* in,
+ guint64* out);
+
+gboolean
+gutil_unsigned_mbn_decode2(
+ const GUtilData* in,
+ guint64* out);
+
+/*
+ * TLV is a convenient and extendible way to pack various kinds of data
+ * into a single memory block. Each entry gets encoded as follows:
+ *
+ * +---
+ * | T (unsigned MBN) : tag (non-zero)
+ * +---
+ * | L (unsigned MBN) : length (zero if there's no data)
+ * +---
+ * | V (L bytes) : tag specific data (optional)
+ * +---
+ *
+ * To make API even more convenient, these utilities restrict the tag
+ * value to INT_MAX which should be enough in most real life situations.
+ * Also, these utilities assume that tags are non-zero. gutil_tlv_decode()
+ * returns zero ifno TLV can be pulled out of the input data, and the
+ * tags array passed to gutil_tlvs_decode() is zero terminated.
+ */
+
+typedef enum gutil_tlvs_decode_flags {
+ GUTIL_TLVS_DECODE_NO_FLAGS = 0,
+ GUTIL_TLVS_DECODE_FLAG_SKIP_UNKNOWN_TAGS = 0x1
+} GUTIL_TLVS_DECODE_FLAGS;
+
+guint
+gutil_tlv_size(
+ guint tag,
+ gsize len);
+
+gsize
+gutil_tlv_encode(
+ gpointer buf,
+ guint tag,
+ const GUtilData* val);
+
+guint
+gutil_tlv_decode(
+ GUtilRange* in,
+ GUtilData* val);
+
+#define GUTIL_TLVS_DECODE_ERROR (-1)
+#define GUTIL_TLVS_DECODE_DUPLICATE_TAG (-2)
+#define GUTIL_TLVS_DECODE_UNKNOWN_TAG (-3)
+
+int
+gutil_tlvs_decode(
+ const GUtilData* in,
+ const guint* tags,
+ GUtilData* vals,
+ GUTIL_TLVS_DECODE_FLAGS flags);
+
+G_END_DECLS
+
+#endif /* GUTIL_DATAPACK_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/include/gutil_log.h
^
|
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2014-2021 Jolla Ltd.
- * Copyright (C) 2014-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2014-2022 Jolla Ltd.
+ * Copyright (C) 2014-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -147,6 +147,13 @@
const void* data,
gsize size); /* Since 1.0.55 */
+void
+gutil_log_dump_bytes(
+ const GLogModule* module,
+ int level,
+ const char* prefix,
+ GBytes* bytes); /* Since 1.0.67 */
+
/* Check if logging is enabled for the specified log level */
gboolean
gutil_log_enabled(
@@ -328,10 +335,13 @@
GLOG_LEVEL_DEBUG, "%s() " f, __FUNCTION__, ##args)
# define GDEBUG_DUMP(buf,n) gutil_log_dump(GLOG_MODULE_CURRENT, \
GLOG_LEVEL_DEBUG, NULL, buf, n) /* Since 1.0.55 */
+# define GDEBUG_DUMP_BYTES(b) gutil_log_dump_bytes(GLOG_MODULE_CURRENT, \
+ GLOG_LEVEL_DEBUG, NULL, b) /* Since 1.0.67 */
# else
# define GDEBUG(f,args...) GLOG_NOTHING
# define GDEBUG_(f,args...) GLOG_NOTHING
# define GDEBUG_DUMP(buf,n) GLOG_NOTHING /* Since 1.0.55 */
+# define GDEBUG_DUMP_BYTES(b) GLOG_NOTHING /* Since 1.0.67 */
# endif /* GUTIL_LOG_DEBUG */
#else
# define GDEBUG_ GDEBUG
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/include/gutil_types.h
^
|
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2014-2021 Jolla Ltd.
- * Copyright (C) 2014-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -48,6 +48,7 @@
typedef struct gutil_inotify_watch GUtilInotifyWatch;
typedef struct gutil_ring GUtilRing;
typedef struct gutil_time_notify GUtilTimeNotify;
+typedef struct gutil_weakref GUtilWeakRef; /* Since 1.0.68 */
typedef struct gutil_data {
const guint8* bytes;
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/include/gutil_version.h
^
|
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GUTIL_VERSION_H
+#define GUTIL_VERSION_H
+
+#include "gutil_types.h"
+
+/*
+ * GUTIL_VERSION_X_Y_Z macros will be added with each release. The fact that
+ * such macro is defined means that you're compiling against libgutil version
+ * X.Y.Z or greater.
+ *
+ * Since 1.0.69
+ */
+
+G_BEGIN_DECLS
+
+#define GUTIL_VERSION_MAJOR 1
+#define GUTIL_VERSION_MINOR 0
+#define GUTIL_VERSION_MICRO 69
+#define GUTIL_VERSION_STRING "1.0.69"
+
+extern const guint gutil_version_major; /* GUTIL_VERSION_MAJOR */
+extern const guint gutil_version_minor; /* GUTIL_VERSION_MINOR */
+extern const guint gutil_version_micro; /* GUTIL_VERSION_MICRO */
+
+/* Version as a single word */
+#define GUTIL_VERSION_(v1,v2,v3) \
+ ((((v1) & 0x7f) << 24) | \
+ (((v2) & 0xfff) << 12) | \
+ ((v3) & 0xfff))
+
+#define GUTIL_VERSION_MAJOR_(v) (((v) >> 24) & 0x7f)
+#define GUTIL_VERSION_MINOR_(v) (((v) >> 12) & 0xfff)
+#define GUTIL_VERSION_MICRO_(v) (((v) & 0xfff))
+
+/* Current compile time version as a single word */
+#define GUTIL_VERSION GUTIL_VERSION_ \
+ (GUTIL_VERSION_MAJOR, GUTIL_VERSION_MINOR, GUTIL_VERSION_MICRO)
+
+/* Runtime version as a single word */
+#define gutil_version() GUTIL_VERSION_ \
+ (gutil_version_major, gutil_version_minor, gutil_version_micro)
+
+/* Specific versions */
+#define GUTIL_VERSION_1_0_69 GUTIL_VERSION_(1,0,69)
+
+G_END_DECLS
+
+#endif /* GUTIL_VERSION_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/include/gutil_weakref.h
^
|
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GUTIL_WEAKREF_H
+#define GUTIL_WEAKREF_H
+
+#include "gutil_types.h"
+
+/*
+ * Ref-countable weak reference can be used to avoid calling g_weak_ref_set()
+ * too often because it grabs global weak_locations_lock for exclusive access.
+ * Note that g_weak_ref_set() is also invoked internally by g_weak_ref_init()
+ * and g_weak_ref_clear().
+ *
+ * g_weak_ref_get() on the other hand only acquires weak_locations_lock
+ * for read-only access which is less of a bottleneck in a multi-threaded
+ * environment. And it's generally significantly simpler and faster than
+ * g_weak_ref_set().
+ *
+ * Since 1.0.68
+ */
+
+G_BEGIN_DECLS
+
+GUtilWeakRef*
+gutil_weakref_new(
+ gpointer obj);
+
+GUtilWeakRef*
+gutil_weakref_ref(
+ GUtilWeakRef* ref);
+
+void
+gutil_weakref_unref(
+ GUtilWeakRef* ref);
+
+gpointer
+gutil_weakref_get(
+ GUtilWeakRef* ref);
+
+void
+gutil_weakref_set(
+ GUtilWeakRef* ref,
+ gpointer obj);
+
+G_END_DECLS
+
+#endif /* GUTIL_WEAKREF_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/rpm/libglibutil.spec
^
|
@@ -1,19 +1,22 @@
Name: libglibutil
-Version: 1.0.64
+Version: 1.0.69
Release: 0
Summary: Library of glib utilities
License: BSD
URL: https://github.com/sailfishos/libglibutil
Source: %{name}-%{version}.tar.bz2
+%define glib_version 2.32
+
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= %{glib_version}
# license macro requires rpm >= 4.11
BuildRequires: pkgconfig(rpm)
%define license_support %(pkg-config --exists 'rpm >= 4.11'; echo $?)
+Requires: glib2 >= %{glib_version}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -23,6 +26,7 @@
%package devel
Summary: Development library for %{name}
Requires: %{name} = %{version}
+Requires: pkgconfig(glib-2.0) >= %{glib_version}
%description devel
This package contains the development library for %{name}.
@@ -34,7 +38,6 @@
make %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
%install
-rm -rf %{buildroot}
make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev
%check
@@ -53,6 +56,7 @@
%files devel
%defattr(-,root,root,-)
+%dir %{_includedir}/gutil
%{_libdir}/pkgconfig/*.pc
%{_libdir}/%{name}.so
%{_includedir}/gutil/*.h
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/src/gutil_datapack.c
^
|
@@ -0,0 +1,478 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gutil_datapack.h"
+
+/*
+ * Compact 7 bits per byte representation of a signed integer with
+ * redundant sign bits removed. Most significant bit is the continuation
+ * flag. Bit 0x40 in the first (most significant) byte is the sign bit.
+ * Unused bits in the most significant chunk must be filled with the
+ * sign bit.
+ *
+ * For positive numbers it's slightly less efficient than encoding unsigned
+ * numbers because of one extra sign bit (e.g. unsigned number 65 can be
+ * squeezed into a single byte but the signed one takes 2 bytes).
+ *
+ * Examples:
+ *
+ * 33 (0x0000000000000021) => 00100001 (0x21)
+ * -33 (0xffffffffffffffdf) => 01011111 (0x5f)
+ * 65 (0x0000000000000041) => 10000000 01000001 (0x80 0x41)
+ * -65 (0xffffffffffffff3f) => 11111111 00111111 (0xff 0x3f)
+ * 129 (0x0000000000000081) => 10000001 00000001 (0x81 0x01)
+ * -129 (0xffffffffffffff7f) => 11111110 01111110 (0xfe 0x7f)
+ */
+
+guint
+gutil_signed_mbn_size(
+ gint64 value)
+{
+ guint n = 1, msc = (value & 0x7f); /* Most Significant Chunk */
+
+ value >>= 7;
+ if (value < 0) {
+ while (value != -1) {
+ msc = (value & 0x7f);
+ value >>= 7;
+ n++;
+ }
+ if (!(msc & 0x40)) {
+ n++; /* Sign bit didn't fit */
+ }
+ } else {
+ while (value) {
+ msc = (value & 0x7f);
+ value >>= 7;
+ n++;
+ }
+ if (msc & 0x40) {
+ n++; /* Sign bit didn't fit */
+ }
+ }
+ return n;
+}
+
+guint
+gutil_signed_mbn_encode(
+ gpointer buf,
+ gint64 value)
+{
+ return gutil_signed_mbn_encode2(buf, value,
+ gutil_signed_mbn_size(value));
+}
+
+guint
+gutil_signed_mbn_encode2(
+ gpointer buf,
+ gint64 value,
+ guint size)
+{
+ guchar* ptr = buf;
+
+ /* Zero or too large size must be a programming error. */
+ if (size > 0) {
+ guint n = size;
+
+ ptr[--n] = (guchar)(value & 0x7f);
+ value >>= 7;
+ while (n) {
+ ptr[--n] = (guchar)(value | 0x80);
+ value >>= 7;
+ }
+
+ if (value < 0) {
+ const int maxbits = sizeof(value) * 8;
+
+ /* Special treatment of negative numbers */
+ if (size * 7 > maxbits) {
+ /* Extend the sign bit */
+ ptr[0] |= ~((1 << (maxbits - (size - 1) * 7)) - 1);
+ }
+ }
+ }
+ return size;
+}
+
+gboolean
+gutil_signed_mbn_decode(
+ GUtilRange* in,
+ gint64* out)
+{
+ if (in->ptr < in->end) {
+ guchar last = in->ptr[0];
+
+ if (last & 0x80) {
+ const int maxbits = sizeof(*out) * 8;
+ const guchar msc = last; /* Most Significant Chunk */
+ int nbits = 7;
+ guint off = 1;
+ guint64 value = (last & 0x7f);
+
+ while ((in->ptr + off) < in->end &&
+ ((last = in->ptr[off++]) & 0x80)) {
+ value = (value << 7) | (last & 0x7f);
+ if ((nbits + 7) <= maxbits) {
+ nbits += 7;
+ } else {
+ /* Too many bytes */
+ return FALSE;
+ }
+ }
+
+ if (!(last & 0x80)) {
+ value = (value << 7) | last;
+ if (msc & 0x40) {
+ /* Negative number */
+ if ((nbits + 7) < maxbits) {
+ /* Extend the sign bit */
+ if (out) {
+ *out = value | ~((G_GINT64_CONSTANT(1) <<
+ (nbits + 7)) - 1);
+ }
+ in->ptr += off;
+ return TRUE;
+ } else {
+ /* Unused bits must be set to 1 */
+ if ((msc | ((1 << (maxbits - nbits)) - 1)) == 0xff) {
+ if (out) {
+ *out = value;
+ }
+ in->ptr += off;
+ return TRUE;
+ }
+ }
+ } else {
+ /* Positive number, unused bits (if any) must be zeroed */
+ /* Unused bits must be zeroed */
+ if ((nbits + 7) < maxbits ||
+ (msc & ~((1 << (maxbits - nbits)) - 1)) == 0x80) {
+ if (out) {
+ *out = value;
+ }
+ in->ptr += off;
+ return TRUE;
+ }
+ }
+ }
+ /* Broken sequence */
+ } else {
+ /* Single byte, very common case */
+ if (out) {
+ if ((*out = *in->ptr++) & 0x40) {
+ /* Small negative number */
+ *out |= (G_GINT64_CONSTANT(-1) ^ 0x7f);
+ }
+ } else {
+ in->ptr++;
+ }
+ return TRUE;
+ }
+ }
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/src/gutil_log.c
^
|
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2014-2021 Jolla Ltd.
- * Copyright (C) 2014-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2014-2022 Jolla Ltd.
+ * Copyright (C) 2014-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -490,6 +490,29 @@
return FALSE;
}
+static
+void
+gutil_log_dump2(
+ const GLogModule* module,
+ int level,
+ const char* prefix,
+ const void* data,
+ gsize size)
+{
+ const guint8* ptr = data;
+ guint off = 0;
+
+ if (!prefix) prefix = "";
+ while (size > 0) {
+ char buf[GUTIL_HEXDUMP_BUFSIZE];
+ const guint consumed = gutil_hexdump(buf, ptr + off, size);
+
+ gutil_log(module, level, "%s%04X: %s", prefix, off, buf);
+ size -= consumed;
+ off += consumed;
+ }
+}
+
void
gutil_log_dump(
const GLogModule* module,
@@ -499,18 +522,21 @@
gsize size) /* Since 1.0.55 */
{
if (gutil_log_enabled(module, level)) {
- const guint8* ptr = data;
- guint off = 0;
+ gutil_log_dump2(module, level, prefix, data, size);
+ }
+}
- if (!prefix) prefix = "";
- while (size > 0) {
- char buf[GUTIL_HEXDUMP_BUFSIZE];
- const guint consumed = gutil_hexdump(buf, ptr + off, size);
-
- gutil_log(module, level, "%s%04X: %s", prefix, off, buf);
- size -= consumed;
- off += consumed;
- }
+void
+gutil_log_dump_bytes(
+ const GLogModule* module,
+ int level,
+ const char* prefix,
+ GBytes* bytes) /* Since 1.0.67 */
+{
+ if (G_LIKELY(bytes) && gutil_log_enabled(module, level)) {
+ gsize size = 0;
+ const guint8* data = g_bytes_get_data(bytes, &size);
+ gutil_log_dump2(module, level, prefix, data, size);
}
}
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/src/gutil_version.c
^
|
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gutil_version.h"
+
+const guint gutil_version_major = GUTIL_VERSION_MAJOR;
+const guint gutil_version_minor = GUTIL_VERSION_MINOR;
+const guint gutil_version_micro = GUTIL_VERSION_MICRO;
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/src/gutil_weakref.c
^
|
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gutil_weakref.h"
+#include "gutil_log.h"
+#include "gutil_macros.h"
+
+#include <glib-object.h>
+
+/*
+ * Ref-countable weak reference can be used to avoid calling g_weak_ref_set()
+ * too often because it grabs global weak_locations_lock for exclusive access.
+ * Note that g_weak_ref_set() is also invoked internally by g_weak_ref_init()
+ * and g_weak_ref_clear().
+ *
+ * g_weak_ref_get() on the other hand only acquires weak_locations_lock
+ * for read-only access which is less of a bottleneck in a multi-threaded
+ * environment. And it's generally significantly simpler and faster than
+ * g_weak_ref_set().
+ *
+ * Since 1.0.68
+ */
+
+struct gutil_weakref {
+ gint ref_count;
+ GWeakRef weak_ref;
+};
+
+GUtilWeakRef*
+gutil_weakref_new(
+ gpointer obj)
+{
+ GUtilWeakRef* self = g_slice_new(GUtilWeakRef);
+
+ g_atomic_int_set(&self->ref_count, 1);
+ g_weak_ref_init(&self->weak_ref, obj);
+ return self;
+}
+
+GUtilWeakRef*
+gutil_weakref_ref(
+ GUtilWeakRef* self)
+{
+ if (G_LIKELY(self)) {
+ GASSERT(self->ref_count > 0);
+ g_atomic_int_inc(&self->ref_count);
+ }
+ return self;
+}
+
+void
+gutil_weakref_unref(
+ GUtilWeakRef* self)
+{
+ if (G_LIKELY(self)) {
+ GASSERT(self->ref_count > 0);
+ if (g_atomic_int_dec_and_test(&self->ref_count)) {
+ g_weak_ref_clear(&self->weak_ref);
+ gutil_slice_free(self);
+ }
+ }
+}
+
+gpointer
+gutil_weakref_get(
+ GUtilWeakRef* self)
+{
+ return G_LIKELY(self) ? g_weak_ref_get(&self->weak_ref) : NULL;
+}
+
+void
+gutil_weakref_set(
+ GUtilWeakRef* self,
+ gpointer obj)
+{
+ if (G_LIKELY(self)) {
+ g_weak_ref_set(&self->weak_ref, obj);
+ }
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/Makefile
^
|
@@ -2,6 +2,7 @@
all:
%:
+ @$(MAKE) -C test_datapack $*
@$(MAKE) -C test_history $*
@$(MAKE) -C test_idlepool $*
@$(MAKE) -C test_idlequeue $*
@@ -12,3 +13,4 @@
@$(MAKE) -C test_misc $*
@$(MAKE) -C test_ring $*
@$(MAKE) -C test_strv $*
+ @$(MAKE) -C test_weakref $*
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/common/Makefile
^
|
@@ -49,6 +49,8 @@
BASE_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS)
BASE_CFLAGS = $(BASE_FLAGS) $(CFLAGS)
FULL_CFLAGS = $(BASE_CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
+ -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \
$(shell pkg-config --cflags $(PKGS))
FULL_LDFLAGS = $(BASE_LDFLAGS)
LIBS = $(shell pkg-config --libs $(PKGS))
@@ -57,10 +59,7 @@
RELEASE_FLAGS =
COVERAGE_FLAGS = -g
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
+KEEP_SYMBOLS ?= 0
ifneq ($(KEEP_SYMBOLS),0)
RELEASE_FLAGS += -g
SUBMAKE_OPTS += KEEP_SYMBOLS=1
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/coverage/run
^
|
@@ -4,6 +4,7 @@
#
TESTS="\
+test_datapack \
test_history \
test_idlepool \
test_idlequeue \
@@ -13,7 +14,8 @@
test_log \
test_misc \
test_ring \
-test_strv"
+test_strv \
+test_weakref"
FLAVOR="coverage"
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_datapack/Makefile
^
|
@@ -0,0 +1,5 @@
+# -*- Mode: makefile-gmake -*-
+
+EXE = test_datapack
+
+include ../common/Makefile
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_datapack/test_datapack.c
^
|
@@ -0,0 +1,873 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "test_common.h"
+
+#include "gutil_datapack.h"
+
+static TestOpt test_opt;
+
+#define TEST_(name) "/datapack/" name
+
+static const guint8 test_unsigned_mbn_data_0[] = { 0x00 };
+static const guint8 test_unsigned_mbn_data_64[] = { 0x40 };
+static const guint8 test_unsigned_mbn_data_127[] = { 0x7f };
+static const guint8 test_unsigned_mbn_data_128[] = { 0x81, 0x00 };
+static const guint8 test_unsigned_mbn_data_257[] = { 0x82, 0x01 };
+static const guint8 test_unsigned_mbn_data_383[] = { 0x82, 0x7f };
+static const guint8 test_unsigned_mbn_data_16383[] = { 0xff, 0x7f };
+static const guint8 test_unsigned_mbn_data_max64[] =
+ { 0x81, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f };
+
+static const guint8 test_signed_mbn_data_0[] = { 0x00 };
+static const guint8 test_signed_mbn_data_33[] = { 0x21 };
+static const guint8 test_signed_mbn_data_m33[] = { 0x5f };
+static const guint8 test_signed_mbn_data_65[] = { 0x80, 0x41 };
+static const guint8 test_signed_mbn_data_m65[] = { 0xff, 0x3f };
+static const guint8 test_signed_mbn_data_127[] = { 0x80, 0x7f };
+static const guint8 test_signed_mbn_data_128[] = { 0x81, 0x00 };
+static const guint8 test_signed_mbn_data_129[] = { 0x81, 0x01 };
+static const guint8 test_signed_mbn_data_m129[] = { 0xfe, 0x7f };
+static const guint8 test_signed_mbn_data_257[] = { 0x82, 0x01 };
+static const guint8 test_signed_mbn_data_383[] = { 0x82, 0x7f };
+static const guint8 test_signed_mbn_data_16383[] = { 0x80, 0xff, 0x7f };
+static const guint8 test_signed_mbn_data_m16383[] = { 0xff, 0x80, 0x01 };
+static const guint8 test_signed_mbn_data_min64[] = {
+ 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+ 0x80, 0x00
+};
+static const guint8 test_signed_mbn_data_max64[] = {
+ 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0x7f
+};
+
+typedef struct {
+ const char* name;
+ GUtilData input;
+} TestDecodeFail;
+
+static const guint8 test_mbn_decode_fail_data_short[] = { 0x80 };
+static const guint8 test_mbn_decode_fail_data_too_long[] = {
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f
+};
+
+/*==========================================================================*
+ * mbn/corner_cases
+ *==========================================================================*/
+
+static
+void
+test_mbn_corner_cases()
+{
+ guint8 buf[1];
+
+ g_assert_cmpuint(gutil_signed_mbn_encode2(buf, 0, 0), == ,0);
+ g_assert_cmpuint(gutil_unsigned_mbn_encode2(buf, 0, 0), == ,0);
+}
+
+/*==========================================================================*
+ * signed_mbn/size
+ *==========================================================================*/
+
+typedef struct {
+ const char* name;
+ gint64 input;
+ guint output;
+} TestSignedMbnSizeData;
+
+/* Use test_mbn_write test data as input */
+static const TestSignedMbnSizeData test_signed_mbn_size_data[] = {
+#define TEST_CASE(x) TEST_("signed_mbn/size/") x
+#define TEST_DATA(x) TEST_CASE(#x), x, sizeof(test_signed_mbn_data_##x)
+#define TEST_DATA_(x) TEST_CASE("-" #x), -x, sizeof(test_signed_mbn_data_m##x)
+ { TEST_DATA(0) },
+ { TEST_DATA(33) },
+ { TEST_DATA_(33) },
+ { TEST_DATA(65) },
+ { TEST_DATA_(65) },
+ { TEST_DATA(127) },
+ { TEST_DATA(128) },
+ { TEST_DATA(129) },
+ { TEST_DATA_(129) },
+ { TEST_DATA(257) },
+ { TEST_DATA(383) },
+ { TEST_DATA(16383) },
+ { TEST_DATA_(16383) },
+ { TEST_CASE("min64"), G_MININT64, sizeof(test_signed_mbn_data_min64) },
+ { TEST_CASE("max64"), G_MAXINT64, sizeof(test_signed_mbn_data_max64) }
+#undef TEST_CASE
+#undef TEST_DATA
+#undef TEST_DATA_
+};
+
+static
+void
+test_signed_mbn_size(
+ gconstpointer data)
+{
+ const TestSignedMbnSizeData* test = data;
+
+ g_assert_cmpuint(gutil_signed_mbn_size(test->input), == ,test->output);
+}
+
+/*==========================================================================*
+ * signed_mbn/encode
+ *==========================================================================*/
+
+typedef struct {
+ const char* name;
+ gint64 input;
+ GUtilData output;
+} TestSignedMbnEncode;
+
+static const TestSignedMbnEncode test_signed_mbn_encode_data[] = {
+#define TEST_CASE(x) TEST_("signed_mbn/encode/") x
+#define TEST_DATA(x) TEST_CASE(#x), x, \
+ { TEST_ARRAY_AND_SIZE(test_signed_mbn_data_##x) }
+#define TEST_DATA_(x) TEST_CASE("-" #x), -x, \
+ { TEST_ARRAY_AND_SIZE(test_signed_mbn_data_m##x) }
+ { TEST_DATA(0) },
+ { TEST_DATA(33) },
+ { TEST_DATA_(33) },
+ { TEST_DATA(65) },
+ { TEST_DATA_(65) },
+ { TEST_DATA(127) },
+ { TEST_DATA(128) },
+ { TEST_DATA(129) },
+ { TEST_DATA_(129) },
+ { TEST_DATA(257) },
+ { TEST_DATA(383) },
+ { TEST_DATA(16383) },
+ { TEST_DATA_(16383) },
+ { TEST_CASE("min64"), G_MININT64,
+ { TEST_ARRAY_AND_SIZE(test_signed_mbn_data_min64) } },
+ { TEST_CASE("max64"), G_MAXINT64,
+ { TEST_ARRAY_AND_SIZE(test_signed_mbn_data_max64) } }
+#undef TEST_CASE
+#undef TEST_DATA
+#undef TEST_DATA_
+};
+
+static
+void
+test_signed_mbn_encode(
+ gconstpointer data)
+{
+ const TestSignedMbnEncode* test = data;
+ guint8* buf = g_malloc(test->output.size);
+
+ memset(buf, 0xaa, test->output.size);
+ g_assert_cmpuint(gutil_signed_mbn_encode(buf, test->input), == ,
+ test->output.size);
+ g_assert(!memcmp(buf, test->output.bytes, test->output.size));
+
+ g_free(buf);
+}
+
+/*==========================================================================*
+ * signed_mbn/decode/ok
+ *==========================================================================*/
+
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_ints/test_ints.c
^
|
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2017 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2017-2022 Jolla Ltd.
+ * Copyright (C) 2017-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -13,9 +13,9 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Jolla Ltd nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -33,6 +33,7 @@
#include "test_common.h"
#include "gutil_ints.h"
+#include "gutil_misc.h"
static TestOpt test_opt;
@@ -141,7 +142,7 @@
g_free(data);
/* And this one duplicates the data because we use test_custom_free: */
- data = g_memdup(a1, sizeof(a1));
+ data = gutil_memdup(a1, sizeof(a1));
i1 = gutil_ints_new_with_free_func(data, G_N_ELEMENTS(a1),
test_custom_free, data);
data = gutil_ints_unref_to_data(i1, &count);
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_log/Makefile
^
|
@@ -1,6 +1,6 @@
# -*- Mode: makefile-gmake -*-
-CFLAGS += -DGLOG_LEVEL_MAX=GLOG_LEVEL_VERBOSE
+CFLAGS += -DGLOG_LEVEL_MAX=GLOG_LEVEL_VERBOSE -DGLOG_LEVEL_ASSERT=GLOG_LEVEL_ALWAYS
EXE = test_log
include ../common/Makefile
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_log/test_log.c
^
|
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2017-2021 Jolla Ltd.
- * Copyright (C) 2017-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2017-2022 Jolla Ltd.
+ * Copyright (C) 2017-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -30,16 +30,18 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef linux
-# define _GNU_SOURCE /* for fopencookie */
-# define HAVE_TEST_LOG_FILE
-#endif
+#define _GNU_SOURCE /* for fopencookie */
#include "test_common.h"
#include "gutil_strv.h"
#include "gutil_log.h"
+#ifdef __GLIBC__
+/* glibc has writeable stdout */
+# define HAVE_TEST_LOG_FILE
+#endif
+
static TestOpt test_opt;
static GString* test_log_buf;
@@ -304,33 +306,50 @@
void)
{
static const guint8 short_data[] = { 0x01, 0x02, 0x03, 0x04 };
+ static const char short_data_dump[] =
+ " 0000: 01 02 03 04 ....\n";
static const guint8 long_data[] = {
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
0x00
};
+ static const char long_data_dump[] =
+ "0000: 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f "
+ "01234567 89:;<=>?\n"
+ "0010: 00 "
+ ".\n";
const GLogProc fn = gutil_log_func;
+ const GLogModule* log = &gutil_log_default;
+ GBytes* bytes;
+
test_log_buf = g_string_new(NULL);
gutil_log_func = test_log_fn;
- gutil_log_dump(&gutil_log_default, GLOG_LEVEL_NONE, NULL,
- short_data, sizeof(short_data));
+ gutil_log_dump_bytes(log, GLOG_LEVEL_NONE, " ", NULL);
+ gutil_log_dump(log,GLOG_LEVEL_NONE," ",TEST_ARRAY_AND_SIZE(short_data));
g_assert_cmpuint(test_log_buf->len, == ,0);
- gutil_log_dump(&gutil_log_default, GLOG_LEVEL_ALWAYS, " ",
- short_data, sizeof(short_data));
- g_assert_cmpstr(test_log_buf->str, == ,
- " 0000: 01 02 03 04 ....\n");
+ gutil_log_dump(log,GLOG_LEVEL_ALWAYS," ",TEST_ARRAY_AND_SIZE(short_data));
+ g_assert_cmpstr(test_log_buf->str, == ,short_data_dump);
g_string_set_size(test_log_buf, 0);
- gutil_log_dump(&gutil_log_default, GLOG_LEVEL_ALWAYS, NULL,
- long_data, sizeof(long_data));
- g_assert_cmpstr(test_log_buf->str, == ,
- "0000: 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f "
- "01234567 89:;<=>?\n"
- "0010: 00 "
- ".\n");
+ bytes = g_bytes_new_static(TEST_ARRAY_AND_SIZE(short_data));
+ gutil_log_dump_bytes(log, GLOG_LEVEL_NONE, " ", bytes);
+ g_assert_cmpuint(test_log_buf->len, == ,0);
+ gutil_log_dump_bytes(log, GLOG_LEVEL_ALWAYS, " ", bytes);
+ g_assert_cmpstr(test_log_buf->str, == ,short_data_dump);
+ g_bytes_unref(bytes);
+
+ g_string_set_size(test_log_buf, 0);
+ gutil_log_dump(log,GLOG_LEVEL_ALWAYS,NULL,TEST_ARRAY_AND_SIZE(long_data));
+ g_assert_cmpstr(test_log_buf->str, == ,long_data_dump);
+
+ g_string_set_size(test_log_buf, 0);
+ bytes = g_bytes_new_static(TEST_ARRAY_AND_SIZE(long_data));
+ gutil_log_dump_bytes(log, GLOG_LEVEL_ALWAYS, NULL, bytes);
+ g_assert_cmpstr(test_log_buf->str, == ,long_data_dump);
+ g_bytes_unref(bytes);
g_string_free(test_log_buf, TRUE);
test_log_buf = NULL;
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_misc/test_misc.c
^
|
@@ -1,6 +1,6 @@
/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
* Copyright (C) 2016-2022 Jolla Ltd.
- * Copyright (C) 2016-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -35,10 +35,23 @@
#include "gutil_misc.h"
#include "gutil_idlepool.h"
#include "gutil_log.h"
+#include "gutil_version.h"
static TestOpt test_opt;
/*==========================================================================*
+ * version
+ *==========================================================================*/
+
+static
+void
+test_version(
+ void)
+{
+ g_assert_cmpuint(gutil_version(), == ,GUTIL_VERSION);
+}
+
+/*==========================================================================*
* disconnect
*==========================================================================*/
@@ -795,6 +808,9 @@
g_assert(gutil_bytes_has_prefix(bytes, TEST_ARRAY_AND_SIZE(prefix)));
g_assert(!gutil_bytes_has_prefix(bytes, TEST_ARRAY_AND_SIZE(not_prefix)));
g_assert(!gutil_bytes_has_prefix(bytes, TEST_ARRAY_AND_SIZE(too_long)));
+
+ g_bytes_unref(empty);
+ g_bytes_unref(bytes);
}
/*==========================================================================*
@@ -824,6 +840,9 @@
g_assert(gutil_bytes_has_suffix(bytes, TEST_ARRAY_AND_SIZE(suffix)));
g_assert(!gutil_bytes_has_suffix(bytes, TEST_ARRAY_AND_SIZE(not_suffix)));
g_assert(!gutil_bytes_has_suffix(bytes, TEST_ARRAY_AND_SIZE(too_long)));
+
+ g_bytes_unref(empty);
+ g_bytes_unref(bytes);
}
/*==========================================================================*
@@ -843,6 +862,7 @@
gutil_log_default.level = g_test_verbose() ?
GLOG_LEVEL_VERBOSE : GLOG_LEVEL_NONE;
+ g_test_add_func(TEST_("version"), test_version);
g_test_add_func(TEST_("disconnect"), test_disconnect);
g_test_add_func(TEST_("hex2bin"), test_hex2bin);
g_test_add_func(TEST_("hexdump"), test_hexdump);
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_weakref/Makefile
^
|
@@ -0,0 +1,5 @@
+# -*- Mode: makefile-gmake -*-
+
+EXE = test_weakref
+
+include ../common/Makefile
|
[-]
[+]
|
Added |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/libglibutil/test/test_weakref/test_weakref.c
^
|
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2023 Slava Monich <slava@monich.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "test_common.h"
+
+#include "gutil_weakref.h"
+
+#include <glib-object.h>
+
+static TestOpt test_opt;
+
+/*==========================================================================*
+ * null
+ *==========================================================================*/
+
+static
+void
+test_null()
+{
+ gutil_weakref_unref(NULL);
+ gutil_weakref_set(NULL, NULL);
+ g_assert(!gutil_weakref_ref(NULL));
+ g_assert(!gutil_weakref_get(NULL));
+}
+
+/*==========================================================================*
+ * basic
+ *==========================================================================*/
+
+static
+void
+test_basic()
+{
+ GObject* obj = g_object_new(TEST_OBJECT_TYPE, NULL);
+ GUtilWeakRef* ref = gutil_weakref_new(obj);
+
+ g_assert(gutil_weakref_ref(ref) == ref);
+ gutil_weakref_unref(ref);
+ g_assert(gutil_weakref_get(ref) == obj);
+ g_object_unref(obj);
+ gutil_weakref_unref(ref);
+
+ ref = gutil_weakref_new(NULL);
+ g_assert(!gutil_weakref_get(ref));
+ gutil_weakref_set(ref, obj);
+ g_assert(gutil_weakref_get(ref) == obj);
+ g_object_unref(obj);
+ g_object_unref(obj); /* This actually deallocates the object */
+ g_assert(!gutil_weakref_get(ref));
+ gutil_weakref_unref(ref);
+}
+
+/*==========================================================================*
+ * Common
+ *==========================================================================*/
+
+#define TEST_(name) "/weakref/" name
+
+int main(int argc, char* argv[])
+{
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ g_type_init();
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+ g_test_init(&argc, &argv, NULL);
+ test_init(&test_opt, argc, argv);
+ g_test_add_func(TEST_("null"), test_null);
+ g_test_add_func(TEST_("basic"), test_basic);
+ return g_test_run();
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/qml/EditAuthTokenDialog.qml
^
|
@@ -2,6 +2,8 @@
import Sailfish.Silica 1.0
import harbour.foilauth 1.0
+import "harbour"
+
Dialog {
id: thisDialog
@@ -51,7 +53,7 @@
anchors.fill: parent
contentHeight: column.height
- visible: opacity > 0
+ interactive: opacity > 0
Behavior on opacity { FadeAnimation { } }
Column {
@@ -118,7 +120,11 @@
//% "Number of password digits"
placeholderText: qsTrId("foilauth-token-digits-placeholder")
text: FoilAuthDefaultDigits
- validator: IntValidator { bottom: 1 }
+ validator: IntValidator {
+ bottom: FoilAuthMinDigits
+ top: FoilAuthMaxDigits
+ }
+ inputMethodHints: Qt.ImhDigitsOnly
enabled: !qrCodeOnly
EnterKey.iconSource: "image://theme/icon-m-enter-next"
@@ -135,6 +141,7 @@
placeholderText: label
text: FoilAuthDefaultCounter
validator: IntValidator {}
+ inputMethodHints: Qt.ImhDigitsOnly
enabled: !qrCodeOnly
visible: type === FoilAuth.TypeHOTP
@@ -154,8 +161,9 @@
placeholderText: qsTrId("foilauth-token-timeshift-placeholder")
text: FoilAuthDefaultTimeShift
validator: IntValidator {}
+ inputMethodHints: Qt.ImhDigitsOnly
enabled: !qrCodeOnly
- visible: type === FoilAuth.TypeTOTP
+ visible: type === FoilAuth.TypeTOTP || type === FoilAuth.TypeSteam
EnterKey.iconSource: "image://theme/icon-m-enter-accept"
EnterKey.onClicked: thisDialog.accept()
@@ -197,6 +205,9 @@
//: Menu item for counter based token
//% "Counter-based (HOTP)"
MenuItem { text: qsTrId("foilauth-token-type-hotp") }
+ //: Menu item for time based token
+ //% "Steam"
+ MenuItem { text: qsTrId("foilauth-token-type-steam") }
}
Component.onCompleted: currentIndex = type
onCurrentIndexChanged: type = currentIndex
@@ -229,17 +240,24 @@
QRCodeImage {
id: qrcodeImage
- anchors.centerIn: parent
+ anchors.horizontalCenter: parent.horizontalCenter
qrcode: generator.qrcode
MouseArea {
+ id: qrcodeMouseArea
+
enabled: !qrCodeOnly
anchors.fill: parent
+ onPressAndHold: ;
onClicked: {
qrCodeOnly = true
flickable.focus = true
}
}
+
+ layer.effect: HarbourPressEffect { source: qrcodeImage }
+ layer.enabled: (qrcodeMouseArea.pressed && qrcodeMouseArea.containsMouse) ||
+ (fullScreenQrcodeMouseArea.pressed && fullScreenQrcodeMouseArea.containsMouse)
}
}
@@ -250,8 +268,11 @@
}
MouseArea {
+ id: fullScreenQrcodeMouseArea
+
enabled: qrCodeOnly
anchors.fill: parent
+ onPressAndHold: ;
onClicked: qrCodeOnly = false
}
@@ -259,6 +280,7 @@
State {
name: "qrcode"
when: qrCodeOnly
+
ParentChange {
target: qrcodeImage
parent: fullScreenQrcodeContainer
@@ -271,6 +293,7 @@
State {
name: "normal"
when: !qrCodeOnly
+
PropertyChanges {
target: flickable
opacity: 1
@@ -281,4 +304,30 @@
}
}
]
+
+ transitions: [
+ Transition {
+ to: "qrcode"
+
+ NumberAnimation {
+ target: qrcodeImage
+ property: "y"
+ from: flickableQrcodeContainer.mapToItem(fullScreenQrcodeContainer, 0, 0).y
+ to: 0
+ duration: 200
+ }
+ },
+ Transition {
+ from: "qrcode"
+ to: "normal"
+
+ NumberAnimation {
+ target: qrcodeImage
+ property: "y"
+ from: fullScreenQrcodeContainer.mapToItem(flickableQrcodeContainer, 0, 0).y
+ to: 0
+ duration: 200
+ }
+ }
+ ]
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/qml/TokenListView.qml
^
|
@@ -252,11 +252,11 @@
showMenuOnPressAndHold: !model.groupHeader
enabled: !disabledItems || !disabledItems.length || disabledItems.indexOf(tokenId) < 0
- height: _hidden ? 0 : implicitHeight
- clip: height < implicitHeight
+ contentHeight: _hidden ? 0 : Theme.itemSizeSmall
+ clip: contentHeight < implicitHeight
visible: height > 0
- Behavior on height {
+ Behavior on contentHeight {
enabled: !listItem.menuOpen
SmoothedAnimation { duration: 200 }
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/settings/settings.qml
^
|
@@ -26,7 +26,7 @@
description: applicationName ?
//: Settings page header description (app version)
//% "Version %1"
- qsTrId("foilauth-settings_page-header-version").arg("1.1.6") : ""
+ qsTrId("foilauth-settings_page-header-version").arg("1.1.7") : ""
Image {
id: appIcon
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuth.cpp
^
|
@@ -1,34 +1,36 @@
/*
- * Copyright (C) 2019-2022 Jolla Ltd.
* Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
+ * Copyright (C) 2019-2022 Jolla Ltd.
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "FoilAuth.h"
@@ -46,10 +48,8 @@
#include "gutil_misc.h"
-#include <QStringList>
#include <QFile>
#include <QFileSystemWatcher>
-#include <QQmlEngine>
#define FOILAPPS_DIR "/usr/bin"
#define FOILPICS_PATH FOILAPPS_DIR "/harbour-foilpics"
@@ -274,7 +274,7 @@
uint aMaxPass,
DigestAlgorithm aAlgorithm)
{
- return FoilAuth::HOTP(aSecret, aTime/PERIOD, aMaxPass, aAlgorithm);
+ return FoilAuth::hash(aSecret, aTime/PERIOD, aAlgorithm) % aMaxPass;
}
uint
@@ -284,7 +284,16 @@
uint aMaxPass,
DigestAlgorithm aAlgorithm)
{
- const guint64 msg = htobe64(aCounter);
+ return FoilAuth::hash(aSecret, aCounter, aAlgorithm) % aMaxPass;
+}
+
+uint
+FoilAuth::hash(
+ const QByteArray aSecret,
+ quint64 aValue,
+ DigestAlgorithm aAlgorithm)
+{
+ const guint64 msg = htobe64(aValue);
GType (*digest_type)(void) = foil_impl_digest_sha1_get_type;
switch (aAlgorithm) {
case DigestAlgorithmSHA1:
@@ -307,7 +316,7 @@
const uint mini_hash = be32toh(*(guint32*)(hash + offset)) & 0x7fffffff;
g_bytes_unref(hash_bytes);
- return mini_hash % aMaxPass;
+ return mini_hash;
}
QString
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuth.h
^
|
@@ -1,34 +1,36 @@
/*
- * Copyright (C) 2019-2022 Jolla Ltd.
* Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
+ * Copyright (C) 2019-2022 Jolla Ltd.
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#ifndef FOILAUTH_H
@@ -72,6 +74,7 @@
enum Type {
TypeTOTP = AuthTypeTOTP,
TypeHOTP = AuthTypeHOTP,
+ TypeSteam = AuthTypeSteam,
DefaultType = DEFAULT_AUTH_TYPE
};
@@ -94,6 +97,8 @@
DigestAlgorithm aAlgorithm = DEFAULT_ALGORITHM);
static uint HOTP(const QByteArray, quint64 aCounter, uint aMaxPass,
DigestAlgorithm aAlgorithm = DEFAULT_ALGORITHM);
+ static uint hash(const QByteArray, quint64 aValue,
+ DigestAlgorithm aAlgorithm = DEFAULT_ALGORITHM);
// Invokable from QML
Q_INVOKABLE static QString toUri(Type aType, const QString aSecretBase32,
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuthImportModel.cpp
^
|
@@ -1,34 +1,36 @@
/*
+ * Copyright (C) 2022-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2022 Jolla Ltd.
- * Copyright (C) 2022 Slava Monich <slava@monich.com>
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "FoilAuthImportModel.h"
@@ -78,6 +80,8 @@
#undef LAST
};
+ static ModelData* import(FoilAuthToken);
+
ModelData(FoilAuthToken);
QVariant get(Role) const;
@@ -87,6 +91,21 @@
FoilAuthToken iToken;
};
+FoilAuthImportModel::ModelData*
+FoilAuthImportModel::ModelData::import(
+ FoilAuthToken aToken)
+{
+ static const QString ISSUER_STEAM("Steam");
+
+ if (aToken.type() == FoilAuthTypes::AuthTypeTOTP &&
+ aToken.issuer() == ISSUER_STEAM) {
+ // Assume it's a Steam token
+ return new ModelData(aToken.withType(FoilAuthTypes::AuthTypeSteam));
+ }
+
+ return new ModelData(aToken);
+}
+
FoilAuthImportModel::ModelData::ModelData(
FoilAuthToken aToken) :
iSelected(true),
@@ -237,14 +256,14 @@
FoilAuthToken singleToken(FoilAuth::parseUri(uri));
if (singleToken.isValid()) {
- items.append(new ModelData(singleToken));
+ items.append(ModelData::import(singleToken));
HDEBUG("single token" << singleToken);
} else {
const QList<FoilAuthToken> tokens(FoilAuth::parseMigrationUri(uri));
const int n = tokens.count();
for (int i = 0; i < n; i++) {
- items.append(new ModelData(tokens.at(i)));
+ items.append(ModelData::import(tokens.at(i)));
}
}
@@ -432,8 +451,8 @@
case ModelData::DigitsRole:
i = aValue.toInt(&ok);
if (ok) {
- if (i >= FoilAuthToken::MIN_DIGITS &&
- i <= FoilAuthToken::MAX_DIGITS) {
+ if (i >= FoilAuthTypes::MIN_DIGITS &&
+ i <= FoilAuthTypes::MAX_DIGITS) {
HDEBUG(aIndex.row() << "digits" << i);
if (entry->iToken.digits() != i) {
entry->iToken = entry->iToken.withDigits(i);
@@ -556,8 +575,8 @@
}
if (aDigits != entry->iToken.digits() &&
- aDigits >= FoilAuthToken::MIN_DIGITS &&
- aDigits <= FoilAuthToken::MAX_DIGITS) {
+ aDigits >= FoilAuthTypes::MIN_DIGITS &&
+ aDigits <= FoilAuthTypes::MAX_DIGITS) {
entry->iToken = entry->iToken.withDigits(aDigits);
HDEBUG(aRow << "digits" << aDigits);
roles.append(ModelData::DigitsRole);
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuthModel.cpp
^
|
@@ -1,34 +1,36 @@
/*
- * Copyright (C) 2019-2022 Jolla Ltd.
* Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
+ * Copyright (C) 2019-2022 Jolla Ltd.
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "FoilAuthModel.h"
@@ -73,9 +75,10 @@
#define HEADER_ALGORITHM "OTP-Algorithm"
#define HEADER_DIGITS "OTP-Digits"
#define HEADER_COUNTER "OTP-Counter" // HOTP specific
-#define HEADER_TIMESHIFT "OTP-TimeShift" // TOTP specific
+#define HEADER_TIMESHIFT "OTP-TimeShift" // TOTP and Steam specific
#define HEADER_FAVORITE "OTP-Favorite"
-#define MAX_HEADERS 8
+#define HEADER_STEAM "OTP-Steam"
+#define MAX_HEADERS 9
// Directories relative to home
#define FOIL_AUTH_DIR "Documents/FoilAuth"
@@ -278,7 +281,8 @@
const char* value = foilmsg_get_value(aMsg, HEADER_TYPE);
if (value) {
if (!g_ascii_strcasecmp(value, FOILAUTH_TYPE_TOTP)) {
- return AuthTypeTOTP;
+ return headerBool(aMsg, HEADER_STEAM, false) ?
+ AuthTypeSteam : AuthTypeTOTP;
} else if (!g_ascii_strcasecmp(value, FOILAUTH_TYPE_HOTP)) {
return AuthTypeHOTP;
}
@@ -780,17 +784,23 @@
headers.count = 0;
if (iToken.type() != DEFAULT_AUTH_TYPE) {
- header[headers.count].name = HEADER_TYPE;
- header[headers.count].value = FOILAUTH_TYPE_DEFAULT;
+ const guint authTypeHeaderIndex = headers.count++;
+
+ header[authTypeHeaderIndex].name = HEADER_TYPE;
+ header[authTypeHeaderIndex].value = FOILAUTH_TYPE_DEFAULT;
switch (iToken.type()) {
+ case AuthTypeSteam:
+ header[headers.count].name = HEADER_STEAM;
+ header[headers.count].value = "1";
+ headers.count++;
+ // fallthrough
case AuthTypeTOTP:
- header[headers.count].value = FOILAUTH_TYPE_TOTP;
+ header[authTypeHeaderIndex].value = FOILAUTH_TYPE_TOTP;
break;
case AuthTypeHOTP:
- header[headers.count].value = FOILAUTH_TYPE_HOTP;
+ header[authTypeHeaderIndex].value = FOILAUTH_TYPE_HOTP;
break;
}
- headers.count++;
}
const QByteArray label(iToken.label().toUtf8());
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuthToken.cpp
^
|
@@ -2,33 +2,35 @@
* Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2019-2022 Jolla Ltd.
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "FoilAuthToken.h"
@@ -222,8 +224,9 @@
}
static OtpType encodeOtpType(AuthType aType) {
switch (aType) {
- case AuthTypeHOTP: return OTP_TYPE_HOTP;
+ case AuthTypeSteam:
case AuthTypeTOTP: return OTP_TYPE_TOTP;
+ case AuthTypeHOTP: return OTP_TYPE_HOTP;
}
return OTP_TYPE_UNSPECIFIED;
}
@@ -240,7 +243,7 @@
static bool parseOtpParameters(GUtilRange*, OtpParameters*);
static void encodeTrailer(QByteArray*, uint, uint, quint64);
- uint password(quint64 aTime);
+ QString password(quint64 aTime);
public:
QAtomicInt iRef;
@@ -282,19 +285,32 @@
{
}
-uint
+QString
FoilAuthToken::Private::password(
quint64 aTime)
{
- uint maxPass = 10;
+ if (iType == AuthTypeSteam) {
+ static const QString ALPHABET("23456789BCDFGHJKMNPQRTVWXY");
+ uint hash = FoilAuth::hash(iSecret, aTime, iAlgorithm);
+ QString pass;
- for (int i = 1; i < iDigits; i++) {
- maxPass *= 10;
- }
+ for (int i = 0; i < iDigits; i++) {
+ pass.append(ALPHABET.at(hash % ALPHABET.size()));
+ hash /= ALPHABET.size();
+ }
+
+ return pass;
+ } else {
+ uint maxPass = 10;
- return (iType == AuthTypeHOTP) ?
- FoilAuth::HOTP(iSecret, iCounter, maxPass, iAlgorithm) :
- FoilAuth::TOTP(iSecret, aTime, maxPass, iAlgorithm);
+ for (int i = 1; i < iDigits; i++) {
+ maxPass *= 10;
+ }
+
+ return QString().sprintf("%0*u", iDigits, (iType == AuthTypeHOTP) ?
+ FoilAuth::HOTP(iSecret, iCounter, maxPass, iAlgorithm) :
+ FoilAuth::TOTP(iSecret, aTime, maxPass, iAlgorithm));
+ }
}
bool
@@ -544,27 +560,19 @@
return iPrivate ? iPrivate->iTimeshift : 0;
}
-uint
-FoilAuthToken::password(
- quint64 aTime) const
-{
- return iPrivate ? iPrivate->password(aTime) : 0;
-}
-
QString
FoilAuthToken::passwordString(
quint64 aTime) const
{
- return iPrivate ?
- QString().sprintf("%0*u", iPrivate->iDigits, password(aTime)) :
- QString();
+ return iPrivate ? iPrivate->password(aTime) : QString();
}
int
FoilAuthToken::validDigits(
int aDigits)
{
- return (aDigits >= MIN_DIGITS && aDigits <= MAX_DIGITS) ?
+ return (aDigits >= FoilAuthTypes::MIN_DIGITS &&
+ aDigits <= FoilAuthTypes::MAX_DIGITS) ?
aDigits : FoilAuthTypes::DEFAULT_DIGITS;
}
@@ -572,9 +580,10 @@
FoilAuthToken::validType(
int aType)
{
- switch (aType) {
+ switch ((FoilAuthTypes::AuthType) aType) {
case FoilAuthTypes::AuthTypeTOTP:
case FoilAuthTypes::AuthTypeHOTP:
+ case FoilAuthTypes::AuthTypeSteam:
return (FoilAuthTypes::AuthType) aType;
}
return FoilAuthTypes::DEFAULT_AUTH_TYPE;
@@ -584,7 +593,7 @@
FoilAuthToken::validAlgorithm(
int aAlgorithm)
{
- switch (aAlgorithm) {
+ switch ((FoilAuthTypes::DigestAlgorithm) aAlgorithm) {
case FoilAuthTypes::DigestAlgorithmSHA1:
case FoilAuthTypes::DigestAlgorithmSHA256:
case FoilAuthTypes::DigestAlgorithmSHA512:
@@ -658,14 +667,20 @@
if (!bytes.isEmpty()) {
FoilAuthTypes::DigestAlgorithm alg = FoilAuthTypes::DEFAULT_ALGORITHM;
- int dig = FoilAuthTypes::DEFAULT_DIGITS;
int imf = FoilAuthTypes::DEFAULT_COUNTER;
int timeshift = FoilAuthTypes::DEFAULT_TIMESHIFT;
+ static const QByteArray ISSUER_STEAM("Steam");
+ const QString tokenIssuer(QUrl::fromPercentEncoding(issuer));
+ int dig = (tokenIssuer == ISSUER_STEAM) ?
+ FoilAuthTypes::DEFAULT_STEAM_DIGITS :
+ FoilAuthTypes::DEFAULT_DIGITS;
+
if (!digits.isEmpty()) {
bool ok;
const int n = digits.toInt(&ok);
- if (ok && n >= MIN_DIGITS && n <= MAX_DIGITS) {
+ if (ok && n >= FoilAuthTypes::MIN_DIGITS &&
+ n <= FoilAuthTypes::MAX_DIGITS) {
dig = n;
}
}
@@ -688,8 +703,7 @@
}
return FoilAuthToken(type, bytes,
QUrl::fromPercentEncoding(label),
- QUrl::fromPercentEncoding(issuer),
- dig, imf, timeshift, alg);
+ tokenIssuer, dig, imf, timeshift, alg);
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuthToken.h
^
|
@@ -2,33 +2,35 @@
* Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2019-2022 Jolla Ltd.
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#ifndef FOILAUTH_TOKEN_H
@@ -65,9 +67,6 @@
static const QString ALGORITHM_SHA256;
static const QString ALGORITHM_SHA512;
- static const int MIN_DIGITS = 1;
- static const int MAX_DIGITS = 9;
-
static const QString KEY_VALID;
static const QString KEY_TYPE;
static const QString KEY_LABEL;
@@ -115,7 +114,6 @@
quint64 counter() const;
int digits() const;
int timeshift() const;
- uint password(quint64 aTime) const;
Q_REQUIRED_RESULT QString passwordString(quint64) const;
Q_REQUIRED_RESULT QString toUri() const;
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/FoilAuthTypes.h
^
|
@@ -1,34 +1,36 @@
/*
+ * Copyright (C) 2021-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2021-2022 Jolla Ltd.
- * Copyright (C) 2021-2022 Slava Monich <slava@monich.com>
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#ifndef FOILAUTH_TYPES_H
@@ -47,7 +49,8 @@
public:
enum AuthType {
AuthTypeTOTP,
- AuthTypeHOTP
+ AuthTypeHOTP,
+ AuthTypeSteam
};
enum DigestAlgorithm {
@@ -58,7 +61,12 @@
static const AuthType DEFAULT_AUTH_TYPE = AuthTypeTOTP;
static const DigestAlgorithm DEFAULT_ALGORITHM = DigestAlgorithmSHA1;
+
+ static const int MIN_DIGITS = 1;
+ static const int MAX_DIGITS = 9;
+ static const int DEFAULT_STEAM_DIGITS = 5;
static const int DEFAULT_DIGITS = 6;
+
static const int DEFAULT_COUNTER = 0;
static const int DEFAULT_TIMESHIFT = 0;
};
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/SailOTP.cpp
^
|
@@ -1,34 +1,36 @@
/*
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2019-2022 Jolla Ltd.
- * Copyright (C) 2019-2022 Slava Monich <slava@monich.com>
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "SailOTP.h"
@@ -64,8 +66,6 @@
bool iFavorite;
};
- static const QString DB_PATH;
-
static const QString DB_TYPE;
static const QString DB_NAME;
static const QString DB_TABLE;
@@ -82,18 +82,17 @@
Private(QStringList, FoilAuthModel*);
private:
- static QString databaseDir();
- static QString databasePath();
+ static QString databasePath(QString);
void fetchTokens(FoilAuthModel*);
+ void fetchTokens(FoilAuthModel*, QString);
+ void fetchTokens(FoilAuthModel*, QSqlDatabase);
public:
QList<Token> iTokens;
QStringList iImportedTokens;
};
-const QString SailOTP::Private::DB_PATH(SailOTP::Private::databasePath());
-
#define TABLE_NAME "OTPStorage"
#define DATABASE_NAME "harbour-sailotp"
const QString SailOTP::Private::DB_TYPE("QSQLITE");
@@ -110,87 +109,106 @@
const QString SailOTP::Private::COL_LEN("len"); // INTEGER
const QString SailOTP::Private::COL_DIFF("diff"); // INTEGER
-QString
-SailOTP::Private::databaseDir()
+SailOTP::Private::Private(
+ QStringList aImportedTokens,
+ FoilAuthModel* aDestModel) :
+ iImportedTokens(aImportedTokens)
{
- QDir dir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
- "/harbour-sailotp/harbour-sailotp/QML/OfflineStorage/Databases");
- return dir.path();
+ // SqlDatabase object needs to go out of scope before we can
+ // call QSqlDatabase::removeDatabase
+ fetchTokens(aDestModel);
+ QSqlDatabase::removeDatabase(DB_NAME);
}
QString
-SailOTP::Private::databasePath()
+SailOTP::Private::databasePath(
+ QString aOrg)
{
// This is how LocalStorage plugin generates database file name
- return databaseDir() + QDir::separator() +
+ const QDir dir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
+ QDir::separator() + aOrg + "/harbour-sailotp/QML/OfflineStorage/Databases");
+
+ return dir.path() + QDir::separator() +
QLatin1String(QCryptographicHash::hash(DATABASE_NAME, QCryptographicHash::Md5).toHex()) +
".sqlite";
}
-SailOTP::Private::Private(
- QStringList aImportedTokens,
- FoilAuthModel* aDestModel) :
- iImportedTokens(aImportedTokens)
+void
+SailOTP::Private::fetchTokens(
+ FoilAuthModel* aDestModel)
{
- // SqlDatabase object needs to go out of scope before we can
- // call QSqlDatabase::removeDatabase
- fetchTokens(aDestModel);
- QSqlDatabase::removeDatabase(DB_NAME);
+ fetchTokens(aDestModel, databasePath("org.seiichiro0185"));
+ fetchTokens(aDestModel, databasePath("harbour-sailotp"));
}
void
SailOTP::Private::fetchTokens(
- FoilAuthModel* aDestModel)
+ FoilAuthModel* aDestModel,
+ QString aDbPath)
{
- QSqlDatabase db(QSqlDatabase::database(Private::DB_NAME));
- if (!db.isValid()) {
- HDEBUG("adding database" << DB_NAME);
- db = QSqlDatabase::addDatabase(DB_TYPE, DB_NAME);
+ if (QFile(aDbPath).exists()) {
+ QSqlDatabase db(QSqlDatabase::database(DB_NAME));
+ if (!db.isValid()) {
+ HDEBUG("adding database" << DB_NAME);
+ db = QSqlDatabase::addDatabase(DB_TYPE, DB_NAME);
+ }
+ db.setDatabaseName(aDbPath);
+ if (db.open()) {
+ HDEBUG("Opened " << qPrintable(aDbPath));
+ fetchTokens(aDestModel, db);
+ db.close();
+ }
}
- db.setDatabaseName(DB_PATH);
- if (db.open()) {
- HDEBUG("Opened " << qPrintable(DB_PATH));
- QSqlQuery query(db);
- if (query.exec("SELECT * FROM " TABLE_NAME " ORDER BY " SORT_COL) ||
- query.exec("SELECT * FROM " TABLE_NAME)) {
- while (query.next()) {
- const QString type(query.value(COL_TYPE).toString());
- const bool isTOTP = !type.compare(FoilAuthToken::TYPE_TOTP, Qt::CaseInsensitive);
- const bool isHOTP = !type.compare(FoilAuthToken::TYPE_HOTP, Qt::CaseInsensitive);
- if (isTOTP || isHOTP) {
- const QString base32(query.value(COL_SECRET).toString());
- const QByteArray secret(HarbourBase32::fromBase32(base32));
- if (!secret.isEmpty()) {
- const QString title(query.value(COL_TITLE).toString());
- const QString secretHash(QString(QCryptographicHash::hash(secret,
- QCryptographicHash::Sha1).toHex()).toLower());
- if (iImportedTokens.contains(secretHash) ||
- (aDestModel && aDestModel->containsSecret(secret))) {
- HDEBUG("SailOTP token" << title << "is already imported");
- } else {
- bool lenOk, diffOk, counterOk;
- const int lenVal = query.value(COL_LEN).toInt(&lenOk);
- const int diffVal = query.value(COL_DIFF).toInt(&diffOk);
- const int counterVal = query.value(COL_COUNTER).toInt(&counterOk);
-
- Token token;
- token.iFavorite = (query.value(COL_FAV).toInt() != 0);
- token.iToken = FoilAuthToken(isHOTP ? FoilAuthTypes::AuthTypeHOTP :
- FoilAuthTypes::AuthTypeTOTP, secret, title, QString(),
- (lenVal && lenVal > 0) ? lenVal : DEFAULT_DIGITS,
- (counterOk && counterVal > 0) ? counterVal : DEFAULT_COUNTER,
- diffOk ? diffVal : DEFAULT_TIMESHIFT, DEFAULT_ALGORITHM);
-
- HDEBUG(token.iToken << token.iFavorite);
- iTokens.append(token);
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/src/main.cpp
^
|
@@ -1,34 +1,36 @@
/*
- * Copyright (C) 2019-2022 Jolla Ltd.
* Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
+ * Copyright (C) 2019-2022 Jolla Ltd.
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "FoilAuthDefs.h"
@@ -168,6 +170,10 @@
context->setContextProperty("QrCodeImageProvider", qrCodeImageProvider);
context->setContextProperty("FoilAuthAppName", QString(FOILAUTH_APP_NAME));
context->setContextProperty("TorchSupported", torchSupported);
+ context->setContextProperty("FoilAuthMinDigits",
+ QVariant::fromValue((int)FoilAuthTypes::MIN_DIGITS));
+ context->setContextProperty("FoilAuthMaxDigits",
+ QVariant::fromValue((int)FoilAuthTypes::MAX_DIGITS));
context->setContextProperty("FoilAuthDefaultDigits",
QVariant::fromValue((int)FoilAuthTypes::DEFAULT_DIGITS));
context->setContextProperty("FoilAuthDefaultCounter",
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/test/Makefile.common
^
|
@@ -18,7 +18,7 @@
# Required packages
#
-PKGS += Qt5Core Qt5Quick libcrypto gobject-2.0 glib-2.0
+PKGS += Qt5Core libcrypto gobject-2.0 glib-2.0
#
# Default target
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/test/TestFoilAuth/TestFoilAuth.cpp
^
|
@@ -176,6 +176,7 @@
void)
{
const QByteArray secret(HarbourBase32::fromBase32("VHIIKTVJC6MEOFTJ"));
+ g_assert_cmpuint(FoilAuth::hash(secret, 1548529350), == ,936036598);
g_assert_cmpuint(FoilAuth::TOTP(secret, 1548529350, 1000000), == ,38068);
}
@@ -193,18 +194,46 @@
(FoilAuth::DigestAlgorithm)-1 /* DigestAlgorithmSHA1 */), == ,207601);
g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000,
(FoilAuth::DigestAlgorithm)-1 /* DigestAlgorithmSHA1 */), == ,444239);
+ g_assert_cmpuint(FoilAuth::hash(secret, 0,
+ FoilAuth::DigestAlgorithmSHA1), == , 738207601);
g_assert_cmpuint(FoilAuth::HOTP(secret, 0, 1000000,
- FoilAuth::DigestAlgorithmSHA1), == ,207601);
+ FoilAuth::DigestAlgorithmSHA1), == , 207601);
+ g_assert_cmpuint(FoilAuth::hash(secret, 1,
+ FoilAuth::DigestAlgorithmSHA1), == , 845444239);
g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000,
- FoilAuth::DigestAlgorithmSHA1), == ,444239);
- g_assert_cmpuint(FoilAuth::HOTP(secret, 0, 1000000,
- FoilAuth::DigestAlgorithmSHA256), == , 367047);
- g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000,
- FoilAuth::DigestAlgorithmSHA256), == , 714922);
- g_assert_cmpuint(FoilAuth::HOTP(secret, 0, 1000000,
- FoilAuth::DigestAlgorithmSHA512), == , 308534);
- g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000,
- FoilAuth::DigestAlgorithmSHA512), == , 899828);
+ FoilAuth::DigestAlgorithmSHA1), == , 444239);
+ g_assert_cmpuint(FoilAuth::hash(secret, 0,
+ FoilAuth::DigestAlgorithmSHA256), == , 1874367047);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 0, 1000000,
+ FoilAuth::DigestAlgorithmSHA256), == , 367047);
+ g_assert_cmpuint(FoilAuth::hash(secret, 1,
+ FoilAuth::DigestAlgorithmSHA256), == , 943714922);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000,
+ FoilAuth::DigestAlgorithmSHA256), == , 714922);
+ g_assert_cmpuint(FoilAuth::hash(secret, 0,
+ FoilAuth::DigestAlgorithmSHA512), == , 1432308534);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 0, 1000000,
+ FoilAuth::DigestAlgorithmSHA512), == , 308534);
+ g_assert_cmpuint(FoilAuth::hash(secret, 1,
+ FoilAuth::DigestAlgorithmSHA512), == , 1775899828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000000,
+ FoilAuth::DigestAlgorithmSHA512), == , 775899828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 100000000,
+ FoilAuth::DigestAlgorithmSHA512), == , 75899828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 10000000,
+ FoilAuth::DigestAlgorithmSHA512), == , 5899828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000000,
+ FoilAuth::DigestAlgorithmSHA512), == , 899828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 100000,
+ FoilAuth::DigestAlgorithmSHA512), == , 99828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 10000,
+ FoilAuth::DigestAlgorithmSHA512), == , 9828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 1000,
+ FoilAuth::DigestAlgorithmSHA512), == , 828);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 100,
+ FoilAuth::DigestAlgorithmSHA512), == , 28);
+ g_assert_cmpuint(FoilAuth::HOTP(secret, 1, 10,
+ FoilAuth::DigestAlgorithmSHA512), == , 8);
}
/*==========================================================================*
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/test/TestFoilAuthToken/TestFoilAuthToken.cpp
^
|
@@ -1,34 +1,36 @@
/*
+ * Copyright (C) 2019-2023 Slava Monich <slava@monich.com>
* Copyright (C) 2019-2022 Jolla Ltd.
- * Copyright (C) 2019-2022 Slava Monich <slava@monich.com>
*
- * You may use this file under the terms of BSD license as follows:
+ * You may use this file under the terms of the BSD license as follows:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING
+ * IN ANY WAY OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * any official policies, either expressed or implied.
*/
#include "FoilAuthToken.h"
@@ -73,7 +75,7 @@
g_assert(token3.withType((FoilAuthTypes::AuthType)-1) == token3);
g_assert(token3.withDigits(0) == token3);
- g_assert(token3.withDigits(FoilAuthToken::MAX_DIGITS + 1) == token3);
+ g_assert(token3.withDigits(FoilAuthTypes::MAX_DIGITS + 1) == token3);
g_assert(token3.withAlgorithm((FoilAuthTypes::DigestAlgorithm)-1) == token3);
g_assert(token3.withType(token3.type()) == token3);
g_assert(token3.withAlgorithm(token3.algorithm()) == token3);
@@ -127,10 +129,10 @@
test_validDigits(
void)
{
- g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthToken::MIN_DIGITS), == ,FoilAuthToken::MIN_DIGITS);
- g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthToken::MIN_DIGITS - 1), == ,FoilAuthTypes::DEFAULT_DIGITS);
- g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthToken::MAX_DIGITS), == ,FoilAuthToken::MAX_DIGITS);
- g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthToken::MAX_DIGITS + 1), == ,FoilAuthTypes::DEFAULT_DIGITS);
+ g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthTypes::MIN_DIGITS), == ,FoilAuthTypes::MIN_DIGITS);
+ g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthTypes::MIN_DIGITS - 1), == ,FoilAuthTypes::DEFAULT_DIGITS);
+ g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthTypes::MAX_DIGITS), == ,FoilAuthTypes::MAX_DIGITS);
+ g_assert_cmpint(FoilAuthToken::validDigits(FoilAuthTypes::MAX_DIGITS + 1), == ,FoilAuthTypes::DEFAULT_DIGITS);
}
/*==========================================================================*
@@ -154,7 +156,6 @@
g_assert_cmpint(invalid.timeshift(), == ,0);
g_assert_cmpint(invalid.counter(), == ,0);
g_assert_cmpint(invalid.digits(), == ,0);
- g_assert_cmpint(invalid.password(123456789), == ,0);
g_assert(invalid.passwordString(123456789).isEmpty());
g_assert(invalid.withType(FoilAuthTypes::DEFAULT_AUTH_TYPE) == invalid);
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-de.ts
^
|
@@ -161,6 +161,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation type="unfinished">Zählerbasiert (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation type="unfinished">Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-fr.ts
^
|
@@ -161,6 +161,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation type="unfinished">Basé sur un compteur (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation type="unfinished">Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-hu.ts
^
|
@@ -160,6 +160,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation type="unfinished">Számláló-alapú (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation type="unfinished">Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-pl.ts
^
|
@@ -162,6 +162,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation>Na podstawie licznika (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation type="unfinished">Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-ru.ts
^
|
@@ -162,6 +162,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation>По счётчику (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation>Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-sv.ts
^
|
@@ -162,6 +162,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation>Räknarbaserad (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation type="unfinished">Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth-zh_CN.ts
^
|
@@ -161,6 +161,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation type="unfinished">基于计数器(HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation type="unfinished">Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-foilauth-1.1.7.tar.gz/translations/harbour-foilauth.ts
^
|
@@ -161,6 +161,11 @@
<extracomment>Menu item for counter based token</extracomment>
<translation>Counter-based (HOTP)</translation>
</message>
+ <message id="foilauth-token-type-steam">
+ <source>Steam</source>
+ <extracomment>Menu item for time based token</extracomment>
+ <translation>Steam</translation>
+ </message>
<message id="foilauth-token-scan-button">
<source>Scan QR code</source>
<extracomment>Button label, opens QR code scan window</extracomment>
|