/*.sdf
/*.opensdf
/ipch
+/build
SUBDIRS = $(WANT_SUBDIRS)
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
+DIST_SUBDIRS = \
+ doc \
+ schemas \
+ configs \
+ shibsp \
+ shibd \
+ adfs \
+ util \
+ apache \
+ nsapi_shib \
+ fastcgi \
+ odbc-store \
+ memcache-store \
+ selinux
if DX_COND_doc
all-local: doxygen-doc
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeader>\r
</PrecompiledHeader>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeader>\r
</PrecompiledHeader>\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,2,0\r
- PRODUCTVERSION 2,4,2,0\r
+ FILEVERSION 2,4,3,0\r
+ PRODUCTVERSION 2,4,3,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "Comments", "\0"\r
- VALUE "CompanyName", "Internet2\0"\r
+ VALUE "CompanyName", "UCAID\0"\r
VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
- VALUE "FileVersion", "2, 4, 2, 0\0"\r
+ VALUE "FileVersion", "2, 4, 3, 0\0"\r
#ifdef SHIBSP_LITE\r
VALUE "InternalName", "adfs-lite\0"\r
#else\r
VALUE "InternalName", "adfs\0"\r
#endif\r
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
VALUE "LegalTrademarks", "\0"\r
#ifdef SHIBSP_LITE\r
VALUE "OriginalFilename", "adfs-lite.so\0"\r
VALUE "OriginalFilename", "adfs.so\0"\r
#endif\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.4.2\0"\r
- VALUE "ProductVersion", "2, 4, 2, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4.3\0"\r
+ VALUE "ProductVersion", "2, 4, 3, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeader>\r
</PrecompiledHeader>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<PrecompiledHeader>\r
</PrecompiledHeader>\r
#include <sstream>
#include <stdexcept>
+#include <cstddef>
#ifdef HAVE_UNISTD_H
#include <unistd.h> // for getpid()
#endif
class ShibTargetApache : public AbstractSPRequest
-#if defined(HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
+#if defined(SHIBSP_HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
, public GSSRequest
#endif
{
const char* getScheme() const {
return m_sc->szScheme ? m_sc->szScheme : ap_http_method(m_req);
}
+ bool isSecure() const {
+ return HTTPRequest::isSecure();
+ }
const char* getHostname() const {
return ap_get_server_name(m_req);
}
#endif
return m_body.c_str();
}
+ const char* getParameter(const char* name) const {
+ return AbstractSPRequest::getParameter(name);
+ }
+ vector<const char*>::size_type getParameters(const char* name, vector<const char*>& values) const {
+ return AbstractSPRequest::getParameters(name, values);
+ }
void clearHeader(const char* rawname, const char* cginame) {
if (m_dc->bUseHeaders == 1) {
// ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(m_req), "shib_clear_header: hdr\n");
}
long returnDecline(void) { return DECLINED; }
long returnOK(void) { return OK; }
-#if defined(HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
+#if defined(SHIBSP_HAVE_GSSAPI) && !defined(SHIB_APACHE_13)
gss_ctx_id_t getGSSContext() const {
gss_ctx_id_t ctx = GSS_C_NO_CONTEXT;
apr_pool_userdata_get((void**)&ctx, g_szGSSContextKey, m_req->pool);
properties["exportAssertion"] = (sta->m_dc->bExportAssertion==1) ? "true" : "false";
if (sta->m_dc->tSettings)
- ap_table_do(_rm_get_all_table_walk, &properties, sta->m_dc->tSettings, nullptr);
+ ap_table_do(_rm_get_all_table_walk, &properties, sta->m_dc->tSettings, NULL);
}
const PropertySet* ApacheRequestMapper::getPropertySet(const char* name, const char* ns) const
ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_out_filter: merging %d headers", apr_table_elts(rc->hdr_out)->nelts);
// can't use overlap call because it will collapse Set-Cookie headers
//apr_table_overlap(r->headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE);
- apr_table_do(_table_add,r->headers_out, rc->hdr_out,nullptr);
+ apr_table_do(_table_add,r->headers_out, rc->hdr_out,NULL);
}
/* remove ourselves from the filter chain */
ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_err_filter: merging %d headers", apr_table_elts(rc->hdr_out)->nelts);
// can't use overlap call because it will collapse Set-Cookie headers
//apr_table_overlap(r->err_headers_out, rc->hdr_out, APR_OVERLAP_TABLES_MERGE);
- apr_table_do(_table_add,r->err_headers_out, rc->hdr_out,nullptr);
+ apr_table_do(_table_add,r->err_headers_out, rc->hdr_out,NULL);
}
/* remove ourselves from the filter chain */
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
<CompileAs>Default</CompileAs>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
<CompileAs>Default</CompileAs>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
<CompileAs>Default</CompileAs>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
<CompileAs>Default</CompileAs>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>..;\Apache2.2.14\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>\r
<BrowseInformation>true</BrowseInformation>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>..;\httpd-2.2-x64\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>\r
<BrowseInformation>true</BrowseInformation>\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "mod_shib_13\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_13.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "mod_shib_20\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_20.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "mod_shib_22\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_22.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
#define PACKAGE "shibboleth"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.internet2.edu/"
+#define PACKAGE_BUGREPORT "https://issues.shibboleth.net/"
/* Define to the full name of this package. */
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.4.2"
+#define PACKAGE_STRING "shibboleth 2.4.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.4.2"
+#define PACKAGE_VERSION "2.4.3"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "2.4.2"
+#define VERSION "2.4.3"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
fi
fi
-if [ $SAML2 -eq 1 ] ; then
- ACS[${#ACS[*]}]=$SAML20PAOS
- ACSLOC[${#ACSLOC[*]}]="SAML2/ECP"
-fi
-
if [ $DECLS -eq 1 ] ; then
DECLS="xmlns:md=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\" "
if [ $DS -eq 1 ] ; then
AC_PREREQ([2.50])
-AC_INIT([shibboleth],[2.4.2],[https://bugs.internet2.edu/],[shibboleth])
+AC_INIT([shibboleth],[2.4.3],[https://issues.shibboleth.net/],[shibboleth])
AC_CONFIG_SRCDIR(shibsp)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
fi
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h shibsp/config_pub.h])
AC_CONFIG_FILES([shibboleth.spec pkginfo Portfile])
AC_PROG_CC([gcc gcc3 cc])
AC_CHECK_HEADER(gss.h,
[
dnl found in the given dirs
- AC_DEFINE([HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSGNU],[1],[if you have the GNU gssapi libraries])
gnu_gss=yes
],
[
AC_CHECK_HEADER([gssapi.h],
[
dnl found
- AC_DEFINE([HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSHEIMDAL],[1],[if you have the Heimdal gssapi libraries])
],
[
dnl no header found, disabling GSS
)
else
dnl MIT found
- AC_DEFINE([HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSMIT],[1],[if you have the MIT gssapi libraries])
dnl check if we have a really old MIT kerberos (<= 1.2)
AC_MSG_CHECKING([if gssapi headers declare GSS_C_NT_HOSTBASED_SERVICE])
AC_COMPILE_IFELSE([
AC_MSG_RESULT(no)
fi
if test x"$want_gss" = xyes; then
- AC_DEFINE([HAVE_GSSAPI],[1],[if you have the gssapi libraries])
+ AC_DEFINE([SHIBSP_HAVE_GSSAPI],[1],[if you have the gssapi libraries])
if test -n "$gnu_gss"; then
LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
LIBS="$LIBS -lgss"
- elif test -z "$GSSAPI_LIB_DIR"; then
- case $host in
- *-*-darwin*)
- LIBS="$LIBS -lgssapi_krb5 -lresolv"
- ;;
- *)
- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
- dnl krb5-config doesn't have --libs-only-L or similar, put everything
- dnl into LIBS
- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
- LIBS="$LIBS $gss_libs"
- elif test "$GSSAPI_ROOT" != "yes"; then
- LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
- LIBS="$LIBS -lgssapi"
- else
- LIBS="$LIBS -lgssapi"
- fi
- ;;
- esac
else
- LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
- LIBS="$LIBS -lgssapi"
+ if test -z "$GSSAPI_LIB_DIR"; then
+ GSSAPI_LIB_DIR="$GSSAPI_ROOT/lib$libsuff"
+ fi
+ if test "$GSSAPI_ROOT" != "yes"; then
+ LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
+ fi
+ if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+ dnl krb5-config doesn't have --libs-only-L or similar, put everything
+ dnl into LIBS
+ gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+ else
+ if test "x$not_mit" = "x1"; then
+ gss_libs="-lgssapi"
+ else
+ gss_libs="-lgssapi_krb5"
+ fi
+ fi
+ LIBS="$LIBS $gss_libs"
fi
+
+ AC_MSG_CHECKING([whether GSS-API naming extensions are available])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+#ifdef SHIBSP_HAVE_GSSGNU
+# include <gss.h>
+#elif defined SHIBSP_HAVE_GSSMIT
+# include <gssapi/gssapi.h>
+# include <gssapi/gssapi_ext.h>
+#else
+# include <gssapi.h>
+#endif]],
+ [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])],
+ [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
+ [AC_MSG_RESULT([no])])
+
+ AC_MSG_CHECKING([whether GSS-API composite name import is available])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+#ifdef SHIBSP_HAVE_GSSGNU
+# include <gss.h>
+#elif defined SHIBSP_HAVE_GSSMIT
+# include <gssapi/gssapi.h>
+# include <gssapi/gssapi_ext.h>
+#else
+# include <gssapi.h>
+#endif]],
+ [[
+ OM_uint32 minor;
+ gss_name_t srcname;
+ gss_buffer_desc importbuf;
+ gss_import_name(&minor, &importbuf, GSS_C_NT_EXPORT_NAME_COMPOSITE, &srcname);
+ ]])],
+ [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_COMPOSITE_NAME],[1],[Define to 1 if GSS-API composite name import is available.])],
+ [AC_MSG_RESULT([no])])
+
else
CPPFLAGS="$save_CPPFLAGS"
fi
pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
install-data-hook:
- cp -r api $(DESTDIR)$(pkgdocdir)
- rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`
+ if test -d api ; then \
+ cp -r api $(DESTDIR)$(pkgdocdir); \
+ rm -rf `find $(DESTDIR)$(pkgdocdir)/api -name .svn`; \
+ fi;
docfiles = \
CREDITS.txt \
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,2,0\r
- PRODUCTVERSION 2,4,2,0\r
+ FILEVERSION 2,4,3,0\r
+ PRODUCTVERSION 2,4,3,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "Comments", "\0"\r
- VALUE "CompanyName", "Internet2\0"\r
+ VALUE "CompanyName", "UCAID\0"\r
VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
- VALUE "FileVersion", "2, 4, 2, 0\0"\r
+ VALUE "FileVersion", "2, 4, 3, 0\0"\r
VALUE "InternalName", "shibauthorizer\0"\r
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
VALUE "LegalTrademarks", "\0"\r
VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.4.2\0"\r
- VALUE "ProductVersion", "2, 4, 2, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4.3\0"\r
+ VALUE "ProductVersion", "2, 4, 3, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,2,0\r
- PRODUCTVERSION 2,4,2,0\r
+ FILEVERSION 2,4,3,0\r
+ PRODUCTVERSION 2,4,3,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "Comments", "\0"\r
- VALUE "CompanyName", "Internet2\0"\r
+ VALUE "CompanyName", "UCAID\0"\r
VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
- VALUE "FileVersion", "2, 4, 2, 0\0"\r
+ VALUE "FileVersion", "2, 4, 3, 0\0"\r
VALUE "InternalName", "shibresponder\0"\r
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
VALUE "LegalTrademarks", "\0"\r
VALUE "OriginalFilename", "shibresponder.exe\0"\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.4.2\0"\r
- VALUE "ProductVersion", "2, 4, 2, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4.3\0"\r
+ VALUE "ProductVersion", "2, 4, 3, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "isapi_shib\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "isapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "memcache-store\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "OriginalFilename", "memcache-store.so\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
END
END
BLOCK "VarFileInfo"
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;..\..\..\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "nsapi_shib\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
<CompileAs>Default</CompileAs>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
<CompileAs>Default</CompileAs>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
if (pexpiration)
q << ",expires";
if (pvalue)
- q << ",CASE version WHEN " << version << " THEN nullptr ELSE value END";
+ q << ",CASE version WHEN " << version << " THEN null ELSE value END";
q << " FROM " << table << " WHERE context='" << scontext << "' AND id='" << skey << "' AND expires > " << timebuf;
freeSafeSQL(scontext, context);
freeSafeSQL(skey, key);
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,0
- PRODUCTVERSION 2,4,2,0
+ FILEVERSION 2,4,3,0
+ PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Internet2\0"
+ VALUE "CompanyName", "UCAID\0"
VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
- VALUE "FileVersion", "2, 4, 2, 0\0"
+ VALUE "FileVersion", "2, 4, 3, 0\0"
VALUE "InternalName", "odbc-store\0"
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"
VALUE "OriginalFilename", "odbc-store.so\0"
- VALUE "ProductName", "Shibboleth 2.4.2\0"
- VALUE "ProductVersion", "2, 4, 2, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4.3\0"
+ VALUE "ProductVersion", "2, 4, 3, 0\0"
END
END
BLOCK "VarFileInfo"
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,4,2,0\r
- PRODUCTVERSION 2,4,2,0\r
+ FILEVERSION 2,4,3,0\r
+ PRODUCTVERSION 2,4,3,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "Comments", "\0"\r
- VALUE "CompanyName", "Internet2\0"\r
+ VALUE "CompanyName", "UCAID\0"\r
VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
- VALUE "FileVersion", "2, 4, 2, 0\0"\r
+ VALUE "FileVersion", "2, 4, 3, 0\0"\r
VALUE "InternalName", "shibd\0"\r
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
VALUE "LegalTrademarks", "\0"\r
VALUE "OriginalFilename", "shibd.exe\0"\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.4.2\0"\r
- VALUE "ProductVersion", "2, 4, 2, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4.3\0"\r
+ VALUE "ProductVersion", "2, 4, 3, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
{
}
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
GSSRequest::GSSRequest()
{
}
* Interface to a GSS-authenticated request.
*/
-#if !defined(__shibsp_gssreq_h__) && defined(HAVE_GSSAPI)
+#if !defined(__shibsp_gssreq_h__) && defined(SHIBSP_HAVE_GSSAPI)
#define __shibsp_gssreq_h__
#include <shibsp/base.h>
#include <xmltooling/io/GenericRequest.h>
-#ifdef HAVE_GSSGNU
+#ifdef SHIBSP_HAVE_GSSGNU
# include <gss.h>
-#elif defined HAVE_GSSMIT
+#elif defined SHIBSP_HAVE_GSSMIT
# include <gssapi/gssapi.h>
# include <gssapi/gssapi_generic.h>
#else
AccessControl.h \
Application.h \
base.h \
+ config_pub.h \
exceptions.h \
paths.h \
GSSRequest.h \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 5:2:0
+libshibsp_la_LDFLAGS = -version-info 5:3:0
libshibsp_la_LIBADD = $(XMLSEC_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 5:2:0
+libshibsp_lite_la_LDFLAGS = -version-info 5:3:0
libshibsp_lite_la_LIBADD = $(LITE_LIBS)
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
shibsp-lite.vcxproj \
shibsp.vcxproj.filters \
shibsp-lite.vcxproj.filters \
+ config_pub.h.in \
+ config_pub_win32.h\
paths.h.in \
resource.h \
shibsp.rc
#include <shibsp/util/PropertySet.h>
#include <set>
+#include <vector>
#include <xmltooling/Lockable.h>
namespace xmltooling {
bool matches(const Attribute& attribute, size_t index) const;
public:
- AttributeScopeRegexFunctor(const DOMElement* e) : m_regex(nullptr), m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)) {
+ AttributeScopeRegexFunctor(const DOMElement* e) : m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)), m_regex(nullptr) {
const XMLCh* r = e ? e->getAttributeNS(nullptr,regex) : nullptr;
if (!r || !*r)
throw ConfigurationException("AttributeScopeRegex MatchFunctor requires non-empty regex attribute.");
public:
AttributeValueStringFunctor(const DOMElement* e)
- : m_value(e ? xmltooling::toUTF8(e->getAttributeNS(nullptr,value)) : nullptr),
- m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)) {
+ : m_attributeID(XMLHelper::getAttrString(e, nullptr, attributeID)),
+ m_value(e ? xmltooling::toUTF8(e->getAttributeNS(nullptr,value)) : nullptr) {
if (!m_value || !*m_value) {
delete[] m_value;
throw ConfigurationException("AttributeValueString MatchFunctor requires non-empty value attribute.");
return m_impl->extractAttributes(application, assertingParty.get(), relyingParty, *name1, attributes);
}
- throw AttributeExtractionException("Unable to extract attributes, unknown object type.");
+ m_log.debug("unable to extract attributes, unknown XML object type: %s", xmlObject.getElementQName().toString().c_str());
}
pair<bool,DOMElement*> XMLExtractor::background_load()
# include <saml/base.h>
#endif
+#if defined (_MSC_VER) || defined(__BORLANDC__)
+ #include <shibsp/config_pub_win32.h>
+#else
+ #include <shibsp/config_pub.h>
+#endif
+
// Windows and GCC4 Symbol Visibility Macros
#ifdef WIN32
#define SHIBSP_IMPORT __declspec(dllimport)
--- /dev/null
+/* if you have the gssapi libraries */
+#undef SHIBSP_HAVE_GSSAPI
+
+/* if you have the GNU gssapi libraries */
+#undef SHIBSP_HAVE_GSSGNU
+
+/* if you have the Heimdal gssapi libraries */
+#undef SHIBSP_HAVE_GSSHEIMDAL
+
+/* if you have the MIT gssapi libraries */
+#undef SHIBSP_HAVE_GSSMIT
+
+/* Define to 1 if log4cpp library is used. */
+#undef SHIBSP_LOG4CPP
+
+/* Define to 1 if log4shib library is used. */
+#undef SHIBSP_LOG4SHIB
+
+/* Define to 1 if Xerces XMLString includes XMLByte release. */
+#undef SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE
+
+/* Define to 1 if Xerces DOMNodeFilter API returns a short. */
+#undef SHIBSP_XERCESC_SHORT_ACCEPTNODE
+
+/* Define to 1 if XML-Security-C supports white/blacklisting algorithms. */
+#undef SHIBSP_XMLSEC_WHITELISTING
--- /dev/null
+/* if you have the gssapi libraries */
+#undef SHIBSP_HAVE_GSSAPI
+
+/* if you have the GNU gssapi libraries */
+#undef SHIBSP_HAVE_GSSGNU
+
+/* if you have the Heimdal gssapi libraries */
+#undef SHIBSP_HAVE_GSSHEIMDAL
+
+/* if you have the MIT gssapi libraries */
+#undef SHIBSP_HAVE_GSSMIT
+
+/* Define to 1 if log4cpp library is used. */
+#undef SHIBSP_LOG4CPP
+
+/* Define to 1 if log4shib library is used. */
+#define SHIBSP_LOG4SHIB 1
+
+#include <xercesc/util/XercesVersion.hpp>
+
+#if (XERCES_VERSION_MAJOR < 3)
+# define SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE 1
+# define SHIBSP_XERCESC_SHORT_ACCEPTNODE 1
+#endif
+
+#ifndef XMLTOOLING_NO_XMLSEC
+# include <xsec/framework/XSECDefs.hpp>
+# if (_XSEC_VERSION_FULL >= 10600)
+# define SHIBSP_XMLSEC_WHITELISTING 1
+# endif
+#endif
#ifndef SHIBSP_LITE
namespace shibsp {
class SHIBSP_DLLLOCAL RemotedRequest :
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
public GSSRequest,
#endif
public HTTPRequest
DDF& m_input;
mutable CGIParser* m_parser;
mutable vector<XSECCryptoX509*> m_certs;
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
mutable gss_ctx_id_t m_gss;
#endif
public:
RemotedRequest(DDF& input) : m_input(input), m_parser(nullptr)
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
, m_gss(GSS_C_NO_CONTEXT)
#endif
{
virtual ~RemotedRequest() {
for_each(m_certs.begin(), m_certs.end(), xmltooling::cleanup<XSECCryptoX509>());
delete m_parser;
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
if (m_gss != GSS_C_NO_CONTEXT) {
OM_uint32 minor;
gss_delete_sec_context(&minor, &m_gss, GSS_C_NO_BUFFER);
const std::vector<XSECCryptoX509*>& getClientCertificates() const;
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
// GSSRequest
gss_ctx_id_t getGSSContext() const;
#endif
return m_certs;
}
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
gss_ctx_id_t RemotedRequest::getGSSContext() const
{
if (m_gss == GSS_C_NO_CONTEXT) {
#endif
}
-#ifdef HAVE_GSSAPI
+#ifdef SHIBSP_HAVE_GSSAPI
const GSSRequest* gss = dynamic_cast<const GSSRequest*>(&request);
if (gss) {
gss_ctx_id_t ctx = gss->getGSSContext();
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<ClInclude Include="AccessControl.h" />\r
<ClInclude Include="Application.h" />\r
<ClInclude Include="base.h" />\r
+ <ClInclude Include="config_pub_win32.h" />\r
<ClInclude Include="exceptions.h" />\r
<ClInclude Include="internal.h" />\r
<ClInclude Include="RequestMapper.h" />\r
<ItemGroup>\r
<None Include="Makefile.am" />\r
<None Include="paths.h.in" />\r
+ <None Include="config_pub.h.in" />\r
</ItemGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
<ClInclude Include="GSSRequest.h">\r
<Filter>Header Files</Filter>\r
</ClInclude>\r
+ <ClInclude Include="config_pub_win32.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<ResourceCompile Include="shibsp.rc">\r
<ItemGroup>\r
<None Include="Makefile.am" />\r
<None Include="paths.h.in" />\r
+ <None Include="config_pub.h.in" />\r
</ItemGroup>\r
</Project>
\ No newline at end of file
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,4,2,0\r
- PRODUCTVERSION 2,4,2,0\r
+ FILEVERSION 1,4,3,0\r
+ PRODUCTVERSION 2,4,3,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "Comments", "\0"\r
- VALUE "CompanyName", "Internet2\0"\r
+ VALUE "CompanyName", "UCAID\0"\r
#ifdef SHIBSP_LITE\r
VALUE "FileDescription", "Shibboleth SP Lite Library\0"\r
#else\r
VALUE "FileDescription", "Shibboleth SP Library\0"\r
#endif\r
- VALUE "FileVersion", "1, 4, 2, 0\0"\r
+ VALUE "FileVersion", "1, 4, 3, 0\0"\r
#ifdef SHIBSP_LITE\r
#ifdef _DEBUG\r
VALUE "InternalName", "shibsp-lite1_4D\0"\r
VALUE "InternalName", "shibsp1_4\0"\r
#endif\r
#endif\r
- VALUE "LegalCopyright", "Copyright © 2011 Internet2\0"\r
+ VALUE "LegalCopyright", "Copyright © 2011 UCAID\0"\r
VALUE "LegalTrademarks", "\0"\r
#ifdef SHIBSP_LITE\r
#ifdef _DEBUG\r
#endif\r
#endif\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.4.2\0"\r
- VALUE "ProductVersion", "2, 4, 2, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4.3\0"\r
+ VALUE "ProductVersion", "2, 4, 3, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<Optimization>Disabled</Optimization>\r
<AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
- <MinimalRebuild>true</MinimalRebuild>\r
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<ClInclude Include="AccessControl.h" />\r
<ClInclude Include="Application.h" />\r
<ClInclude Include="base.h" />\r
+ <ClInclude Include="config_pub_win32.h" />\r
<ClInclude Include="exceptions.h" />\r
<ClInclude Include="internal.h" />\r
<ClInclude Include="RequestMapper.h" />\r
<ItemGroup>\r
<None Include="Makefile.am" />\r
<None Include="paths.h.in" />\r
+ <None Include="config_pub.h.in" />\r
</ItemGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
<ImportGroup Label="ExtensionTargets">\r
<ClInclude Include="GSSRequest.h">\r
<Filter>Header Files</Filter>\r
</ClInclude>\r
+ <ClInclude Include="config_pub_win32.h">\r
+ <Filter>Header Files</Filter>\r
+ </ClInclude>\r
</ItemGroup>\r
<ItemGroup>\r
<ResourceCompile Include="shibsp.rc">\r
<ItemGroup>\r
<None Include="Makefile.am" />\r
<None Include="paths.h.in" />\r
+ <None Include="config_pub.h.in" />\r
</ItemGroup>\r
</Project>
\ No newline at end of file
#define SHIBSP_VERSION_MAJOR 1
#define SHIBSP_VERSION_MINOR 4
-#define SHIBSP_VERSION_REVISION 2
+#define SHIBSP_VERSION_REVISION 3
/** DO NOT MODIFY BELOW THIS LINE */
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<BrowseInformation>true</BrowseInformation>\r
<WarningLevel>Level3</WarningLevel>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
- <MinimalRebuild>true</MinimalRebuild>\r
</ClCompile>\r
<ResourceCompile>\r
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r