[xmlsectool] branch master updated: XSTJ-36 - port from V2 stack to V3 stack
Ian Young
ian at iay.org.uk
Sat May 14 06:58:30 EDT 2016
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository xmlsectool.
The following commit(s) were added to refs/heads/master by this push:
new 0ae8fd3 XSTJ-36 - port from V2 stack to V3 stack
0ae8fd3 is described below
commit 0ae8fd31a8a5d3c8ec9236d2f1328da2bb1165d9
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Sat May 14 11:58:07 2016 +0100
XSTJ-36 - port from V2 stack to V3 stack
Initial conversion. Highlights:
* use V3 parent project, checkstyle and other Eclipse settings
* use java-support and OpenSAML v3
* use v4 commons-httpclient
* drop unneeded no-trust TLS handling, now available from java-support
* fix up dependencies and dependency scopes
* new SchemaValidator to fill gaps in new schema handling code
* temporarily blocked signing other than with RSA and EC
---
.classpath | 46 ++-
.settings/org.eclipse.core.resources.prefs | 6 +
.settings/org.eclipse.jdt.core.prefs | 351 +++++++++++++++++++++
.settings/org.eclipse.jdt.ui.prefs | 63 ++++
.settings/org.eclipse.m2e.core.prefs | 4 +
checkstyle.xml | 18 +-
pom.xml | 86 +++--
src/main/assembly/bin.xml | 2 +-
.../net/shibboleth/tool/xmlsectool/Blacklist.java | 2 +-
.../tool/xmlsectool/CredentialHelper.java | 58 ++--
.../shibboleth/tool/xmlsectool/DigestChoice.java | 2 +-
.../tool/xmlsectool/SchemaValidator.java | 149 +++++++++
.../net/shibboleth/tool/xmlsectool/XmlSecTool.java | 136 ++++----
.../XmlSecToolCommandLineArgumentsTest.java | 2 +-
14 files changed, 763 insertions(+), 162 deletions(-)
diff --git a/.classpath b/.classpath
index 7ed3e1b..e43402f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,16 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<classpath>
-
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
-
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
-
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..29abf99
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0af3689
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,351 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=1
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..bdc8c0e
--- /dev/null
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,63 @@
+cleanup.add_default_serial_version_id=false
+cleanup.add_generated_serial_version_id=true
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=false
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=true
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=true
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_Shibboleth
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Shibboleth
+formatter_settings_version=11
+internal.default.compliance=default
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=false
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Commen [...]
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/checkstyle.xml b/checkstyle.xml
index eecca8d..5565264 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -15,8 +15,11 @@
<property name="tabWidth" value="4"/>
<module name="JavadocMethod">
<property name="allowThrowsTagsForSubclasses" value="true"/>
+ <property name="allowUndeclaredRTE" value="true"/>
+ </module>
+ <module name="JavadocType">
+ <property name="allowUnknownTags" value="true"/>
</module>
- <module name="JavadocType"/>
<module name="JavadocVariable"/>
<module name="JavadocStyle">
<property name="checkEmptyJavadoc" value="true"/>
@@ -38,7 +41,7 @@
<property name="max" value="120"/>
</module>
<module name="MethodLength">
- <property name="max" value="50"/>
+ <property name="max" value="70"/>
</module>
<module name="ParameterNumber">
<property name="max" value="5"/>
@@ -47,11 +50,9 @@
<module name="MethodParamPad"/>
<module name="ModifierOrder"/>
<module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
- <module name="AvoidInlineConditionals"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="HiddenField"/>
@@ -62,13 +63,9 @@
<module name="SimplifyBooleanReturn"/>
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
<module name="VisibilityModifier"/>
<module name="ArrayTypeStyle"/>
<module name="UpperEll"/>
- <module name="AbstractClassName">
- <property name="format" value="^Abstract.*$|^Base.*$"/>
- </module>
<module name="AnonInnerLength"/>
<module name="EmptyForInitializerPad"/>
<module name="CovariantEquals"/>
@@ -76,13 +73,12 @@
<module name="DeclarationOrder"/>
<module name="ExplicitInitialization"/>
<module name="FallThrough"/>
- <module name="IllegalCatch"/>
<module name="IllegalThrows"/>
<module name="MultipleVariableDeclarations"/>
<module name="PackageDeclaration"/>
<module name="ParameterAssignment"/>
<module name="ReturnCount">
- <property name="max" value="4"/>
+ <property name="max" value="8"/>
</module>
<module name="StringLiteralEquality"/>
<module name="SuperFinalize"/>
@@ -110,4 +106,4 @@
<property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development, \n * Inc. (UCAID) under one or more contributor license agreements. See the \n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache \n * License, Version 2.0 (the "License"); you may not use this file except in \n * compliance with the License. You may obtain a [...]
</module>
<module name="JavadocPackage"/>
-</module>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 75c5b49..c71c3a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,8 @@
<parent>
<groupId>net.shibboleth</groupId>
- <artifactId>parent-v2</artifactId>
- <version>TRUNK-SNAPSHOT</version>
+ <artifactId>parent-v3</artifactId>
+ <version>9</version>
</parent>
<groupId>net.shibboleth.tool</groupId>
@@ -22,7 +22,9 @@
</description>
<properties>
- <svn.relative.location>utilities/xmlsectool</svn.relative.location>
+ <opensaml.groupId>org.opensaml</opensaml.groupId>
+ <opensaml.version>3.2.0</opensaml.version>
+ <java-support.version>7.2.0</java-support.version>
</properties>
<repositories>
@@ -45,57 +47,71 @@
<dependencies>
<!-- Compile dependencies -->
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>openws</artifactId>
- <version>1.5.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>${java-support.version}</version>
</dependency>
<dependency>
- <groupId>org.opensaml</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.4.0</version>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core</artifactId>
+ <version>${opensaml.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
</dependency>
<dependency>
- <groupId>edu.internet2.middleware</groupId>
- <artifactId>shibboleth-jce</artifactId>
- <version>1.1.0</version>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
</dependency>
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
<!-- Runtime dependencies -->
-
- <!-- Managed Dependencies -->
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
+ <version>${opensaml.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>${slf4j.groupId}</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+
</dependencies>
<profiles>
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
index bfb3603..d069662 100644
--- a/src/main/assembly/bin.xml
+++ b/src/main/assembly/bin.xml
@@ -13,7 +13,7 @@
<outputDirectory>/lib</outputDirectory>
<directoryMode>774</directoryMode>
<fileMode>444</fileMode>
- <scope>compile</scope>
+ <scope>runtime</scope>
<includes>
<include>*:jar:*</include>
</includes>
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java b/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java
index c60f6f3..49b8286 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.Set;
import java.util.TreeSet;
-import org.opensaml.xml.signature.SignatureConstants;
+import org.opensaml.xmlsec.signature.support.SignatureConstants;
/**
* A blacklist of digest and signature algorithms we should not accept during
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java b/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
index 6c06ea2..e70c7f0 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
@@ -30,13 +30,12 @@ import java.security.Security;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
-import javax.net.ssl.X509TrustManager;
-
-import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.security.x509.BasicX509Credential;
-import org.opensaml.xml.security.x509.X509Util;
+import org.opensaml.security.crypto.KeySupport;
+import org.opensaml.security.x509.BasicX509Credential;
+import org.opensaml.security.x509.X509Support;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,23 +45,6 @@ public class CredentialHelper {
/** Class logger. */
private static final Logger LOG = LoggerFactory.getLogger(CredentialHelper.class);
- public static X509TrustManager buildNoTrustTrustManager() {
- X509TrustManager noTrustManager = new X509TrustManager() {
-
- public void checkClientTrusted(X509Certificate ax509certificate[], String s) {
- }
-
- public void checkServerTrusted(X509Certificate ax509certificate[], String s) {
- }
-
- public X509Certificate[] getAcceptedIssuers() {
- return new X509Certificate[0];
- }
-
- };
- return noTrustManager;
- }
-
/**
* Reads in the X509 credentials from the filesystem.
*
@@ -74,22 +56,25 @@ public class CredentialHelper {
*/
protected static BasicX509Credential getFileBasedCredentials(String keyFile, String keyPassword,
String certificateFile) throws KeyException, CertificateException {
- BasicX509Credential credential = new BasicX509Credential();
LOG.debug("Reading PEM/DER encoded credentials from the filesystem");
+
+ // First, read the certificate
+ LOG.debug("Reading certificates from file {}", certificateFile);
+ final Collection<X509Certificate> certificates = X509Support.decodeCertificates(new File(certificateFile));
+ final X509Certificate entityCertificate = certificates.iterator().next();
+ final BasicX509Credential credential = new BasicX509Credential(entityCertificate);
+ credential.setEntityCertificateChain(certificates);
+ LOG.debug("Certificates successfully read");
+
if (keyFile != null) {
LOG.debug("Reading private key from file {}", keyFile);
if (keyPassword == null) {
- credential.setPrivateKey(SecurityHelper.decodePrivateKey(new File(keyFile), null));
+ credential.setPrivateKey(KeySupport.decodePrivateKey(new File(keyFile), null));
} else {
- credential.setPrivateKey(SecurityHelper.decodePrivateKey(new File(keyFile), keyPassword.toCharArray()));
+ credential.setPrivateKey(KeySupport.decodePrivateKey(new File(keyFile), keyPassword.toCharArray()));
}
LOG.debug("Private key succesfully read");
}
- LOG.debug("Reading certificates from file {}", certificateFile);
- credential.setEntityCertificateChain(X509Util.decodeCertificate(new File(certificateFile)));
- credential.setEntityCertificate(credential.getEntityCertificateChain().iterator().next());
- credential.setPublicKey(credential.getEntityCertificate().getPublicKey());
- LOG.debug("Certificates successfully");
return credential;
}
@@ -152,7 +137,7 @@ public class CredentialHelper {
if (keystoreProvider != null) {
LOG.debug("Creating PKCS11 keystore with provider {} and configuration file {}", keystoreProvider,
pkcs11Config);
- Class<Provider> providerClass = (Class<Provider>) XmlSecTool.class.getClassLoader().loadClass(
+ Class<Provider> providerClass = (Class<Provider>) CredentialHelper.class.getClassLoader().loadClass(
keystoreProvider);
Constructor<Provider> providerConstructor = providerClass.getConstructor(String.class);
Provider pkcs11Provider = providerConstructor.newInstance(pkcs11Config);
@@ -196,18 +181,19 @@ public class CredentialHelper {
KeyStore.Entry keyEntry = keystore.getEntry(keyAlias,
new KeyStore.PasswordProtection(keyPassword.toCharArray()));
- BasicX509Credential credential = new BasicX509Credential();
+ BasicX509Credential credential;
if (keyEntry instanceof PrivateKeyEntry) {
PrivateKeyEntry privKeyEntry = (PrivateKeyEntry) keyEntry;
List certChain = Arrays.asList(privKeyEntry.getCertificateChain());
- credential.setEntityCertificate((X509Certificate) privKeyEntry.getCertificate());
+ credential = new BasicX509Credential((X509Certificate) privKeyEntry.getCertificate());
credential.setEntityCertificateChain(certChain);
credential.setPrivateKey(privKeyEntry.getPrivateKey());
- credential.setPublicKey(privKeyEntry.getCertificate().getPublicKey());
} else if (keyEntry instanceof KeyStore.TrustedCertificateEntry) {
KeyStore.TrustedCertificateEntry certEntry = (KeyStore.TrustedCertificateEntry) keyEntry;
- credential.setEntityCertificate((X509Certificate) certEntry.getTrustedCertificate());
- credential.setPublicKey(credential.getEntityCertificate().getPublicKey());
+ credential = new BasicX509Credential((X509Certificate) certEntry.getTrustedCertificate());
+ } else {
+ // unknown kind of Keystore.Entry
+ throw new CertificateException("unknown type of key entry in keystore");
}
LOG.debug("Successfully read credentials from keystore");
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java b/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java
index 445ab12..4a73841 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/DigestChoice.java
@@ -17,7 +17,7 @@
package net.shibboleth.tool.xmlsectool;
-import org.opensaml.xml.signature.SignatureConstants;
+import org.opensaml.xmlsec.signature.support.SignatureConstants;
/**
* The digest method to use in the various signature algorithms.
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java b/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
new file mode 100644
index 0000000..5f77dec
--- /dev/null
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/SchemaValidator.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.tool.xmlsectool;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.Validator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.SAXException;
+
+import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
+import net.shibboleth.utilities.java.support.xml.SchemaBuilder;
+import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
+
+/**
+ * Validates XML documents based on a schema file, or a collection of schema
+ * files contained in a directory.
+ */
+public class SchemaValidator {
+
+ /** Class logger. */
+ private final Logger log = LoggerFactory.getLogger(SchemaValidator.class);
+
+ /**
+ * Compiled schema object. Can be reused for multiple document validations.
+ */
+ private final Schema schema;
+
+ /**
+ * Constructor.
+ *
+ * @param schemaLanguage schema language in use: either XSD or RELAX
+ * @param schemaLocation location of the schema description (may be a directory of schema files)
+ * @throws SAXException
+ */
+ public SchemaValidator(@Nonnull final SchemaLanguage schemaLanguage, @Nonnull final File schemaLocation)
+ throws SAXException {
+ Constraint.isNotNull(schemaLanguage, "schema language must not be null");
+ Constraint.isNotNull(schemaLocation, "schema location must not be null");
+ final SchemaBuilder builder = new SchemaBuilder();
+ builder.setSchemaLanguage(schemaLanguage);
+
+ // locate the schema sources
+ final List<File> schemaFiles = new ArrayList<>();
+ getSchemaFiles(schemaLanguage, new File[]{schemaLocation}, schemaFiles);
+ for (final File schemaFile : schemaFiles) {
+ builder.addSchema(new StreamSource(schemaFile));
+ }
+
+ // build the schema
+ schema = builder.buildSchema();
+ }
+
+ /**
+ * Provides the file name extension associated with a schema language.
+ *
+ * Results include the ".".
+ *
+ * @param schemaLanguage schema language
+ * @return the file name extension associated with the schema language
+ */
+ private String schemaFileExtension(@Nonnull SchemaLanguage schemaLanguage) {
+ switch (schemaLanguage) {
+ case XML:
+ return ".xsd";
+
+ case RELAX:
+ return ".rng";
+
+ default:
+ throw new ConstraintViolationException("unknown schema language");
+ }
+ }
+
+ /**
+ * Gets all of the schema files in the given set of readable files, directories or subdirectories.
+ *
+ * @param lang schema language, must not be null
+ * @param schemaFilesOrDirectories files and directories which may contain schema files
+ * @param accumulatedSchemaFiles list that accumulates the schema files
+ */
+ protected void getSchemaFiles(@Nonnull final SchemaLanguage lang,
+ final File[] schemaFilesOrDirectories,
+ final List<File> accumulatedSchemaFiles) {
+
+ Constraint.isNull(lang, "Schema language may not be null");
+
+ if (schemaFilesOrDirectories == null || schemaFilesOrDirectories.length == 0) {
+ return;
+ }
+
+ for (final File handle : schemaFilesOrDirectories) {
+ if (handle == null) {
+ continue;
+ }
+
+ if (!handle.canRead()) {
+ log.debug("Ignoring '{}', no read permission", handle.getAbsolutePath());
+ }
+
+ if (handle.isFile() && handle.getName().endsWith(schemaFileExtension(lang))) {
+ log.debug("Added schema source '{}'", handle.getAbsolutePath());
+ accumulatedSchemaFiles.add(handle);
+ }
+
+ if (handle.isDirectory()) {
+ getSchemaFiles(lang, handle.listFiles(), accumulatedSchemaFiles);
+ }
+ }
+ }
+
+ /**
+ * Validate a document against the compiled schema.
+ *
+ * @param document document to validate
+ * @throws SAXException if the document fails to validate
+ * @throws IOException if an I/O error occurs while reading the document
+ */
+ public void validate(@Nonnull final Source document) throws SAXException, IOException {
+ final Validator validator = schema.newValidator();
+ validator.validate(document);
+ }
+
+}
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java b/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java
index 5931f2d..c756b77 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java
@@ -47,13 +47,14 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.validation.Schema;
-import javax.xml.validation.Validator;
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.xml.security.Init;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Base64InputStream;
+import org.apache.commons.codec.binary.Base64OutputStream;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.keys.content.KeyName;
@@ -66,20 +67,16 @@ import org.apache.xml.security.signature.reference.ReferenceSubTreeData;
import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
-import org.opensaml.ws.soap.client.http.HttpClientBuilder;
-import org.opensaml.ws.soap.client.http.TLSProtocolSocketFactory;
-import org.opensaml.xml.schema.SchemaBuilder;
-import org.opensaml.xml.schema.SchemaBuilder.SchemaLanguage;
-import org.opensaml.xml.security.BasicSecurityConfiguration;
-import org.opensaml.xml.security.DefaultSecurityConfigurationBootstrap;
-import org.opensaml.xml.security.SecurityHelper;
-import org.opensaml.xml.security.x509.BasicX509Credential;
-import org.opensaml.xml.security.x509.X509Util;
-import org.opensaml.xml.signature.Signature;
-import org.opensaml.xml.signature.SignatureConstants;
-import org.opensaml.xml.util.Base64;
-import org.opensaml.xml.util.DatatypeHelper;
-import org.opensaml.xml.util.XMLHelper;
+import org.opensaml.core.config.InitializationException;
+import org.opensaml.core.config.InitializationService;
+import org.opensaml.security.credential.CredentialSupport;
+import org.opensaml.security.x509.BasicX509Credential;
+import org.opensaml.security.x509.X509Support;
+import org.opensaml.xmlsec.SecurityConfigurationSupport;
+import org.opensaml.xmlsec.SignatureSigningConfiguration;
+import org.opensaml.xmlsec.algorithm.AlgorithmSupport;
+import org.opensaml.xmlsec.signature.Signature;
+import org.opensaml.xmlsec.signature.support.SignatureConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
@@ -90,6 +87,13 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
+import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.AttributeSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
+import net.shibboleth.utilities.java.support.xml.SerializeSupport;
+
public final class XmlSecTool {
/** Return code indicating command completed successfully, {@value} . */
@@ -165,9 +169,9 @@ public final class XmlSecTool {
initLogging(cli);
try {
- Init.init();
- } catch (Throwable e) {
- log.error("Unable to initialize XML security libraries", e);
+ InitializationService.initialize();
+ } catch (InitializationException e) {
+ log.error("Unable to initialize OpenSAML library", e);
System.exit(1);
}
@@ -255,7 +259,7 @@ public final class XmlSecTool {
InputStream ins = new FileInputStream(cli.getInputFile());
if (cli.isBase64DecodeInput()) {
log.debug("Passing input file through Base64 decoder.");
- ins = new Base64.InputStream(ins);
+ ins = new Base64InputStream(ins);
}
if (cli.isInflateInput()) {
log.debug("Passing input file data through Inflater decompression filter");
@@ -285,26 +289,26 @@ public final class XmlSecTool {
protected static InputStream getXmlInputStreamFromUrl(XmlSecToolCommandLineArguments cli) {
log.info("Reading XML document from URL '{}'", cli.getInputUrl());
HttpClientBuilder httpClientBuilder = new HttpClientBuilder();
- httpClientBuilder.setHttpsProtocolSocketFactory(new TLSProtocolSocketFactory(null, CredentialHelper
- .buildNoTrustTrustManager()));
+ httpClientBuilder.setConnectionDisregardTLSCertificate(true);
if (cli.getHttpProxy() != null) {
- httpClientBuilder.setProxyHost(cli.getHttpProxy());
- httpClientBuilder.setProxyPort(cli.getHttpProxyPort());
- httpClientBuilder.setProxyUsername(cli.getHttpProxyUsername());
- httpClientBuilder.setProxyPassword(cli.getHttpProxyPassword());
+ httpClientBuilder.setConnectionProxyHost(cli.getHttpProxy());
+ httpClientBuilder.setConnectionProxyPort(cli.getHttpProxyPort());
+ httpClientBuilder.setConnectionProxyUsername(cli.getHttpProxyUsername());
+ httpClientBuilder.setConnectionProxyPassword(cli.getHttpProxyPassword());
}
- GetMethod getMethod = new GetMethod(cli.getInputUrl());
- getMethod.setRequestHeader("Accept-Encoding", "gzip,deflate");
+ HttpGet getMethod = new HttpGet(cli.getInputUrl());
+ getMethod.setHeader("Accept-Encoding", "gzip,deflate");
try {
HttpClient httpClient = httpClientBuilder.buildClient();
- httpClient.executeMethod(getMethod);
- if (getMethod.getStatusCode() != 200) {
- log.error("Non-ok status code '" + Integer.valueOf(getMethod.getStatusCode()) + "' returned by '"
+ final HttpResponse response = httpClient.execute(getMethod);
+ final int status = response.getStatusLine().getStatusCode();
+ if (status != 200) {
+ log.error("Non-ok status code '" + Integer.valueOf(status) + "' returned by '"
+ cli.getInputUrl() + "'");
System.exit(2);
}
- InputStream ins = getMethod.getResponseBodyAsStream();
- Header contentEncodingHeader = getMethod.getResponseHeader("Content-Encoding");
+ InputStream ins = response.getEntity().getContent();
+ Header contentEncodingHeader = response.getFirstHeader("Content-Encoding");
if (contentEncodingHeader != null) {
String contentEncoding = contentEncodingHeader.getValue();
if ("deflate".equalsIgnoreCase(contentEncoding)) {
@@ -318,11 +322,13 @@ public final class XmlSecTool {
}
if (cli.isBase64DecodeInput()) {
log.debug("Passing input file through Base64 decoder.");
- ins = new Base64.InputStream(ins);
+ ins = new Base64InputStream(ins);
}
return ins;
} catch (IOException e) {
log.error("Unable to read XML document from " + cli.getInputUrl(), e);
+ } catch (Exception e) {
+ log.error("error building an HTTP client instance for " + cli.getInputUrl(), e);
}
System.exit(2);
return null;
@@ -363,19 +369,12 @@ public final class XmlSecTool {
* @param xml document to validate
*/
protected static void schemaValidate(final XmlSecToolCommandLineArguments cli, final Document xml) {
- Validator validator;
+ final SchemaLanguage schemaLanguage = cli.isXsdSchema() ? SchemaLanguage.XML : SchemaLanguage.RELAX;
+ final File schemaFileOrDirectory = new File(cli.getSchemaDirectory());
+ final SchemaValidator validator;
try {
- final File schemaFileOrDirectory = new File(cli.getSchemaDirectory());
- Schema schema;
- if (cli.isXsdSchema()) {
- log.debug("Building W3 XML Schema from file/directory '{}'", schemaFileOrDirectory.getAbsolutePath());
- schema = SchemaBuilder.buildSchema(SchemaLanguage.XML, schemaFileOrDirectory);
- } else {
- log.debug("Building RELAX NG Schema from file/directory '{}'", schemaFileOrDirectory.getAbsolutePath());
- schema = SchemaBuilder.buildSchema(SchemaLanguage.RELAX, schemaFileOrDirectory);
- }
-
- validator = schema.newValidator();
+ log.debug("Building W3 XML Schema from file/directory '{}'", schemaFileOrDirectory.getAbsolutePath());
+ validator = new SchemaValidator(schemaLanguage, schemaFileOrDirectory);
} catch (SAXException e) {
log.error("Invalid XML schema files, unable to validate XML", e);
System.exit(RC_INVALID_XS);
@@ -421,7 +420,8 @@ public final class XmlSecTool {
* * fall back to a signature algorithm based on the signing credential type.
*/
BasicX509Credential signingCredential = getCredential(cli);
- BasicSecurityConfiguration securityConfig = DefaultSecurityConfigurationBootstrap.buildDefaultConfig();
+ SignatureSigningConfiguration securityConfig =
+ SecurityConfigurationSupport.getGlobalSignatureSigningConfiguration();
String signatureAlgorithm = cli.getSignatureAlgorithm();
if (signatureAlgorithm == null) {
final String credentialAlgorithm = signingCredential.getPublicKey().getAlgorithm();
@@ -431,11 +431,21 @@ public final class XmlSecTool {
} else if ("EC".equals(credentialAlgorithm)) {
signatureAlgorithm = cli.getDigest().getEcdsaAlgorithm();
} else {
- signatureAlgorithm = securityConfig.getSignatureAlgorithmURI(signingCredential);
+ /*
+ * Not RSA, not EC, so probably some kind of symmetric algorithm.
+ *
+ * Previously handled this way:
+ *
+ * signatureAlgorithm = securityConfig.getSignatureAlgorithmURI(signingCredential);
+ *
+ * For now, just refuse to deal with it.
+ */
+ log.error("unimplemented signing credential type: {}", credentialAlgorithm);
+ System.exit(RC_SIG);
}
log.debug("signature algorithm {} selected from credential+digest", signatureAlgorithm);
}
- boolean hmac = SecurityHelper.isHMAC(signatureAlgorithm);
+ boolean hmac = AlgorithmSupport.isHMAC(signatureAlgorithm);
Integer hmacOutputLength = securityConfig.getSignatureHMACOutputLength();
/*
@@ -471,7 +481,7 @@ public final class XmlSecTool {
signatureElement = signature.getElement();
addSignatureELement(cli, documentRoot, signatureElement);
- signature.sign(SecurityHelper.extractSigningKey(signingCredential));
+ signature.sign(CredentialSupport.extractSigningKey(signingCredential));
log.info("XML document successfully signed");
} catch (XMLSecurityException e) {
log.error("Unable to create XML document signature", e);
@@ -535,7 +545,7 @@ public final class XmlSecTool {
if (referenceAttribute != null) {
// Mark the reference attribute as a valid ID attribute
rootElement.setIdAttributeNode(referenceAttribute, true);
- reference = DatatypeHelper.safeTrim(referenceAttribute.getValue());
+ reference = StringSupport.trim(referenceAttribute.getValue());
if (reference.length() > 0) {
reference = "#" + reference;
}
@@ -604,7 +614,7 @@ public final class XmlSecTool {
* If the reference is empty, it implicitly references the document element
* and no attribute is being referenced.
*/
- if (DatatypeHelper.isEmpty(referenceUri)) {
+ if (referenceUri == null || referenceUri.trim().isEmpty()) {
log.debug("reference was empty; no ID marking required");
return;
}
@@ -612,7 +622,7 @@ public final class XmlSecTool {
/*
* If something has already identified an ID element, don't interfere
*/
- if (XMLHelper.getIdAttribute(docElement) != null ) {
+ if (AttributeSupport.getIdAttribute(docElement) != null ) {
log.debug("document element already has an ID attribute");
return;
}
@@ -665,7 +675,7 @@ public final class XmlSecTool {
return;
}
}
- log.debug("XML document contained Signature element\n{}", XMLHelper.prettyPrintXML(signatureElement));
+ log.debug("XML document contained Signature element\n{}", SerializeSupport.prettyPrintXML(signatureElement));
log.debug("Creating XML security library XMLSignature object");
XMLSignature signature = null;
@@ -705,8 +715,8 @@ public final class XmlSecTool {
System.exit(RC_SIG);
}
- Key verificationKey = SecurityHelper.extractVerificationKey(getCredential(cli));
- log.debug("Verifying XML signature with key\n{}", Base64.encodeBytes(verificationKey.getEncoded()));
+ Key verificationKey = CredentialSupport.extractVerificationKey(getCredential(cli));
+ log.debug("Verifying XML signature with key\n{}", Base64.encodeBase64String(verificationKey.getEncoded()));
try {
if (signature.checkSignatureValue(verificationKey)) {
/*
@@ -869,7 +879,7 @@ public final class XmlSecTool {
*/
protected static Element getSignatureElement(Document xmlDoc) {
List<Element> sigElements =
- XMLHelper
+ ElementSupport
.getChildElementsByTagNameNS(xmlDoc.getDocumentElement(),
Signature.DEFAULT_ELEMENT_NAME.getNamespaceURI(),
Signature.DEFAULT_ELEMENT_NAME.getLocalPart());
@@ -963,7 +973,7 @@ public final class XmlSecTool {
log.error("Unable to read CRL file " + crlFilePath);
System.exit(RC_INVALID_CRED);
}
- crls.addAll(X509Util.decodeCRLs(crlFile));
+ crls.addAll(X509Support.decodeCRLs(crlFile));
}
} catch (CRLException e) {
log.error("Unable to parse CRL file " + crlFile.getAbsolutePath(), e);
@@ -996,7 +1006,7 @@ public final class XmlSecTool {
OutputStream out = new FileOutputStream(cli.getOutputFile());
if (cli.isBase64EncodedOutput()) {
log.debug("Base64 encoding output to file");
- out = new Base64.OutputStream(out);
+ out = new Base64OutputStream(out);
}
if (cli.isDeflateOutput()) {
log.debug("Deflate compressing output to file");
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XmlSecToolCommandLineArgumentsTest.java b/src/test/java/net/shibboleth/tool/xmlsectool/XmlSecToolCommandLineArgumentsTest.java
index d0d636f..ca8eca2 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XmlSecToolCommandLineArgumentsTest.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XmlSecToolCommandLineArgumentsTest.java
@@ -1,6 +1,6 @@
package net.shibboleth.tool.xmlsectool;
-import org.opensaml.xml.signature.SignatureConstants;
+import org.opensaml.xmlsec.signature.support.SignatureConstants;
import org.testng.Assert;
import org.testng.annotations.Test;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list