projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
858f076
)
https://issues.shibboleth.net/jira/browse/CPPOST-81
2.5.2
author
Scott Cantor
<cantor.2@osu.edu>
Wed, 9 Jan 2013 05:35:31 +0000
(
05:35
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Wed, 9 Jan 2013 05:35:31 +0000
(
05:35
+0000)
config_win32.h
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
saml/Makefile.am
patch
|
blob
|
history
saml/saml.rc
patch
|
blob
|
history
saml/util/CommonDomainCookie.cpp
patch
|
blob
|
history
saml/version.h
patch
|
blob
|
history
samlsign/samlsign.rc
patch
|
blob
|
history
diff --git
a/config_win32.h
b/config_win32.h
index
7402cc1
..
5d4db31
100644
(file)
--- a/
config_win32.h
+++ b/
config_win32.h
@@
-87,13
+87,13
@@
#define PACKAGE_NAME "opensaml"
/* Define to the full name and version of this package. */
#define PACKAGE_NAME "opensaml"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "opensaml 2.5.
1
"
+#define PACKAGE_STRING "opensaml 2.5.
2
"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "opensaml"
/* Define to the version of this package. */
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "opensaml"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.
1
"
+#define PACKAGE_VERSION "2.5.
2
"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
@@
-106,7
+106,7
@@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "2.5.
1
"
+#define VERSION "2.5.
2
"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git
a/configure.ac
b/configure.ac
index
4d2b783
..
38233e3
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,5
@@
AC_PREREQ([2.50])
AC_PREREQ([2.50])
-AC_INIT([opensaml],[2.5.
1
],[https://issues.shibboleth.net/],[opensaml])
+AC_INIT([opensaml],[2.5.
2
],[https://issues.shibboleth.net/],[opensaml])
AC_CONFIG_SRCDIR(saml)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_SRCDIR(saml)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
diff --git
a/saml/Makefile.am
b/saml/Makefile.am
index
643ab6d
..
ffb9831
100644
(file)
--- a/
saml/Makefile.am
+++ b/
saml/Makefile.am
@@
-191,7
+191,7
@@
libsaml_la_SOURCES = \
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libsaml_la_LDFLAGS = -version-info 8:
1
:0
+libsaml_la_LDFLAGS = -version-info 8:
2
:0
install-exec-hook:
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
install-exec-hook:
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
diff --git
a/saml/saml.rc
b/saml/saml.rc
index
85a66e2
..
a381b5b
100644
(file)
--- a/
saml/saml.rc
+++ b/
saml/saml.rc
@@
-28,8
+28,8
@@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
\r
\r
VS_VERSION_INFO VERSIONINFO
\r
//
\r
\r
VS_VERSION_INFO VERSIONINFO
\r
- FILEVERSION 2,5,
1
,0
\r
- PRODUCTVERSION 2,5,
1
,0
\r
+ FILEVERSION 2,5,
2
,0
\r
+ PRODUCTVERSION 2,5,
2
,0
\r
FILEFLAGSMASK 0x3fL
\r
#ifdef _DEBUG
\r
FILEFLAGS 0x1L
\r
FILEFLAGSMASK 0x3fL
\r
#ifdef _DEBUG
\r
FILEFLAGS 0x1L
\r
@@
-47,13
+47,13
@@
BEGIN
VALUE "Comments", "\0"
\r
VALUE "CompanyName", "Shibboleth Consortium\0"
\r
VALUE "FileDescription", "OpenSAML Library\0"
\r
VALUE "Comments", "\0"
\r
VALUE "CompanyName", "Shibboleth Consortium\0"
\r
VALUE "FileDescription", "OpenSAML Library\0"
\r
- VALUE "FileVersion", "2, 5,
1
, 0\0"
\r
+ VALUE "FileVersion", "2, 5,
2
, 0\0"
\r
#ifdef _DEBUG
\r
VALUE "InternalName", "saml2_5D\0"
\r
#else
\r
VALUE "InternalName", "saml2_5\0"
\r
#endif
\r
#ifdef _DEBUG
\r
VALUE "InternalName", "saml2_5D\0"
\r
#else
\r
VALUE "InternalName", "saml2_5\0"
\r
#endif
\r
- VALUE "LegalCopyright", "Copyright © 201
2
UCAID\0"
\r
+ VALUE "LegalCopyright", "Copyright © 201
3
UCAID\0"
\r
VALUE "LegalTrademarks", "\0"
\r
#ifdef _DEBUG
\r
VALUE "OriginalFilename", "saml2_5D.dll\0"
\r
VALUE "LegalTrademarks", "\0"
\r
#ifdef _DEBUG
\r
VALUE "OriginalFilename", "saml2_5D.dll\0"
\r
@@
-61,8
+61,8
@@
BEGIN
VALUE "OriginalFilename", "saml2_5.dll\0"
\r
#endif
\r
VALUE "PrivateBuild", "\0"
\r
VALUE "OriginalFilename", "saml2_5.dll\0"
\r
#endif
\r
VALUE "PrivateBuild", "\0"
\r
- VALUE "ProductName", "OpenSAML 2.5.
1
\0"
\r
- VALUE "ProductVersion", "2, 5,
1
, 0\0"
\r
+ VALUE "ProductName", "OpenSAML 2.5.
2
\0"
\r
+ VALUE "ProductVersion", "2, 5,
2
, 0\0"
\r
VALUE "SpecialBuild", "\0"
\r
END
\r
END
\r
VALUE "SpecialBuild", "\0"
\r
END
\r
END
\r
diff --git
a/saml/util/CommonDomainCookie.cpp
b/saml/util/CommonDomainCookie.cpp
index
5fa1391
..
23b15ef
100644
(file)
--- a/
saml/util/CommonDomainCookie.cpp
+++ b/
saml/util/CommonDomainCookie.cpp
@@
-53,6
+53,9
@@
CommonDomainCookie::CommonDomainCookie(const char* cookie)
split(m_list, b64, is_space(), algorithm::token_compress_on);
free(b64);
split(m_list, b64, is_space(), algorithm::token_compress_on);
free(b64);
+ // Remove empty elements.
+ m_list.erase(remove(m_list.begin(), m_list.end(), ""), m_list.end());
+
// Now Base64 decode the list elements, overwriting them.
xsecsize_t len;
for (vector<string>::iterator i = m_list.begin(); i != m_list.end(); ++i) {
// Now Base64 decode the list elements, overwriting them.
xsecsize_t len;
for (vector<string>::iterator i = m_list.begin(); i != m_list.end(); ++i) {
@@
-90,22
+93,24
@@
const char* CommonDomainCookie::set(const char* entityID)
xsecsize_t len;
string delimited;
for (vector<string>::const_iterator j = m_list.begin(); j != m_list.end(); ++j) {
xsecsize_t len;
string delimited;
for (vector<string>::const_iterator j = m_list.begin(); j != m_list.end(); ++j) {
- if (!delimited.empty())
- delimited += ' ';
XMLByte* b64 = Base64::encode(reinterpret_cast<const XMLByte*>(j->c_str()), j->length(), &len);
XMLByte* b64 = Base64::encode(reinterpret_cast<const XMLByte*>(j->c_str()), j->length(), &len);
- XMLByte *pos, *pos2;
- for (pos = b64, pos2 = b64; *pos2; ++pos2)
- if (isgraph(*pos2))
- *pos++ = *pos2;
- *pos = 0;
+ if (b64) {
+ XMLByte *pos, *pos2;
+ for (pos = b64, pos2 = b64; *pos2; ++pos2)
+ if (isgraph(*pos2))
+ *pos++ = *pos2;
+ *pos = 0;
- delimited += reinterpret_cast<char*>(b64);
+ if (!delimited.empty())
+ delimited += ' ';
+ delimited += reinterpret_cast<char*>(b64);
#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
#ifdef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
- XMLString::release(&b64);
+
XMLString::release(&b64);
#else
#else
- XMLString::release((char**)&b64);
+
XMLString::release((char**)&b64);
#endif
#endif
+ }
}
m_encoded = XMLToolingConfig::getConfig().getURLEncoder()->encode(delimited.c_str());
}
m_encoded = XMLToolingConfig::getConfig().getURLEncoder()->encode(delimited.c_str());
diff --git
a/saml/version.h
b/saml/version.h
index
9f9656d
..
6102bfe
100644
(file)
--- a/
saml/version.h
+++ b/
saml/version.h
@@
-44,7
+44,7
@@
#define OPENSAML_VERSION_MAJOR 2
#define OPENSAML_VERSION_MINOR 5
#define OPENSAML_VERSION_MAJOR 2
#define OPENSAML_VERSION_MINOR 5
-#define OPENSAML_VERSION_REVISION
1
+#define OPENSAML_VERSION_REVISION
2
/** DO NOT MODIFY BELOW THIS LINE */
/** DO NOT MODIFY BELOW THIS LINE */
diff --git
a/samlsign/samlsign.rc
b/samlsign/samlsign.rc
index
2696ee6
..
c44a4a1
100644
(file)
--- a/
samlsign/samlsign.rc
+++ b/
samlsign/samlsign.rc
@@
-28,8
+28,8
@@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,
1
,0
- PRODUCTVERSION 2,5,
1
,0
+ FILEVERSION 2,5,
2
,0
+ PRODUCTVERSION 2,5,
2
,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@
-47,14
+47,14
@@
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "OpenSAML Signature Utility\0"
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
VALUE "FileDescription", "OpenSAML Signature Utility\0"
- VALUE "FileVersion", "2, 5,
1
, 0\0"
+ VALUE "FileVersion", "2, 5,
2
, 0\0"
VALUE "InternalName", "samlsign\0"
VALUE "InternalName", "samlsign\0"
- VALUE "LegalCopyright", "Copyright © 201
2
UCAID\0"
+ VALUE "LegalCopyright", "Copyright © 201
3
UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "samlsign.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "samlsign.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "OpenSAML 2.5.
1
\0"
- VALUE "ProductVersion", "2, 5,
1
, 0\0"
+ VALUE "ProductName", "OpenSAML 2.5.
2
\0"
+ VALUE "ProductVersion", "2, 5,
2
, 0\0"
VALUE "SpecialBuild", "\0"
END
END
VALUE "SpecialBuild", "\0"
END
END