diff options
Diffstat (limited to 'libpamc')
| -rw-r--r-- | libpamc/Makefile.in | 12 | ||||
| -rw-r--r-- | libpamc/include/security/pam_client.h | 3 | ||||
| -rw-r--r-- | libpamc/pamc.pc.in | 2 | ||||
| -rw-r--r-- | libpamc/pamc_client.c | 3 | ||||
| -rw-r--r-- | libpamc/pamc_converse.c | 3 | ||||
| -rw-r--r-- | libpamc/pamc_load.c | 7 | ||||
| -rw-r--r-- | libpamc/test/Makefile.in | 12 |
7 files changed, 34 insertions, 8 deletions
diff --git a/libpamc/Makefile.in b/libpamc/Makefile.in index 424c175a..c99f86cd 100644 --- a/libpamc/Makefile.in +++ b/libpamc/Makefile.in @@ -294,6 +294,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCBOOK_RNG = @DOCBOOK_RNG@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -306,11 +307,13 @@ EXEEXT = @EXEEXT@ EXE_CFLAGS = @EXE_CFLAGS@ EXE_LDFLAGS = @EXE_LDFLAGS@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FO2PDF = @FO2PDF@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +HTML_STYLESHEET = @HTML_STYLESHEET@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -342,12 +345,14 @@ LIBSELINUX = @LIBSELINUX@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOGIND_CFLAGS = @LOGIND_CFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_STYLESHEET = @MAN_STYLESHEET@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -370,6 +375,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDF_STYLESHEET = @PDF_STYLESHEET@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -380,12 +386,16 @@ SECUREDIR = @SECUREDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STRINGPARAM_HMAC = @STRINGPARAM_HMAC@ +STRINGPARAM_PROFILECONDITIONS = @STRINGPARAM_PROFILECONDITIONS@ STRINGPARAM_VENDORDIR = @STRINGPARAM_VENDORDIR@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ TIRPC_CFLAGS = @TIRPC_CFLAGS@ TIRPC_LIBS = @TIRPC_LIBS@ +TXT_STYLESHEET = @TXT_STYLESHEET@ USE_NLS = @USE_NLS@ +VENDOR_SCONFIGDIR = @VENDOR_SCONFIGDIR@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ diff --git a/libpamc/include/security/pam_client.h b/libpamc/include/security/pam_client.h index 41f83da6..0fc2cf44 100644 --- a/libpamc/include/security/pam_client.h +++ b/libpamc/include/security/pam_client.h @@ -24,7 +24,8 @@ extern "C" { typedef struct pamc_handle_s *pamc_handle_t; /* binary prompt structure pointer */ -typedef struct { uint32_t length; uint8_t control; } *pamc_bp_t; +typedef struct { uint32_t length; uint8_t control; } + __attribute__ ((__packed__)) *pamc_bp_t; /* * functions provided by libpamc diff --git a/libpamc/pamc.pc.in b/libpamc/pamc.pc.in index 25a63854..2d841ebb 100644 --- a/libpamc/pamc.pc.in +++ b/libpamc/pamc.pc.in @@ -1,3 +1,5 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ diff --git a/libpamc/pamc_client.c b/libpamc/pamc_client.c index 175f424d..b7be8219 100644 --- a/libpamc/pamc_client.c +++ b/libpamc/pamc_client.c @@ -7,6 +7,7 @@ */ #include "libpamc.h" +#include "pam_inline.h" /* * liberate path list @@ -145,7 +146,7 @@ static int __pamc_shutdown_agents(pamc_handle_t pch) } pid = this->pid = 0; - memset(this->id, 0, this->id_length); + pam_overwrite_n(this->id, this->id_length); free(this->id); this->id = NULL; this->id_length = 0; diff --git a/libpamc/pamc_converse.c b/libpamc/pamc_converse.c index f8f60edf..4da11cf0 100644 --- a/libpamc/pamc_converse.c +++ b/libpamc/pamc_converse.c @@ -7,6 +7,7 @@ */ #include "libpamc.h" +#include "pam_inline.h" /* * select agent @@ -157,7 +158,7 @@ int pamc_converse(pamc_handle_t pch, pamc_bp_t *prompt_p) size = PAM_BP_SIZE(raw); control = PAM_BP_RCONTROL(raw); - memset(raw, 0, sizeof(raw)); + pam_overwrite_array(raw); D(("agent replied with prompt of size %d and control %u", size, control)); diff --git a/libpamc/pamc_load.c b/libpamc/pamc_load.c index 24a65dfd..b4fa78b3 100644 --- a/libpamc/pamc_load.c +++ b/libpamc/pamc_load.c @@ -7,6 +7,7 @@ */ #include "libpamc.h" +#include "pam_inline.h" static int __pamc_exec_agent(pamc_handle_t pch, pamc_agent_t *agent) { @@ -143,7 +144,7 @@ close_the_agent: close(to_agent[1]); free_and_return: - memset(full_path, 0, reset_length); + pam_overwrite_n(full_path, reset_length); free(full_path); D(("returning %d", return_code)); @@ -301,10 +302,10 @@ int pamc_load(pamc_handle_t pch, const char *agent_id) fail_free_agent_id: - memset(agent->id, 0, agent->id_length); + pam_overwrite_n(agent->id, agent->id_length); free(agent->id); - memset(agent, 0, sizeof(*agent)); + pam_overwrite_object(agent); fail_free_agent: diff --git a/libpamc/test/Makefile.in b/libpamc/test/Makefile.in index e2f360bd..bedb16b7 100644 --- a/libpamc/test/Makefile.in +++ b/libpamc/test/Makefile.in @@ -162,6 +162,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DOCBOOK_RNG = @DOCBOOK_RNG@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -174,11 +175,13 @@ EXEEXT = @EXEEXT@ EXE_CFLAGS = @EXE_CFLAGS@ EXE_LDFLAGS = @EXE_LDFLAGS@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FO2PDF = @FO2PDF@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ +HTML_STYLESHEET = @HTML_STYLESHEET@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -210,12 +213,14 @@ LIBSELINUX = @LIBSELINUX@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOGIND_CFLAGS = @LOGIND_CFLAGS@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MAN_STYLESHEET = @MAN_STYLESHEET@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -238,6 +243,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PDF_STYLESHEET = @PDF_STYLESHEET@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -248,12 +254,16 @@ SECUREDIR = @SECUREDIR@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STRINGPARAM_HMAC = @STRINGPARAM_HMAC@ +STRINGPARAM_PROFILECONDITIONS = @STRINGPARAM_PROFILECONDITIONS@ STRINGPARAM_VENDORDIR = @STRINGPARAM_VENDORDIR@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ TIRPC_CFLAGS = @TIRPC_CFLAGS@ TIRPC_LIBS = @TIRPC_LIBS@ +TXT_STYLESHEET = @TXT_STYLESHEET@ USE_NLS = @USE_NLS@ +VENDOR_SCONFIGDIR = @VENDOR_SCONFIGDIR@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ |