This is not comprehensive; there are still many files that have lines
longer that 80 characters.
---
lib/config/config.c | 12 ++--
lib/configlib/config_load.c | 70 ++++++++++---------
lib/configlib/configlib.c | 6 +-
lib/configlib/configlib.h | 6 +-
lib/configlib/configlib_type.h | 6 +-
lib/rpki-rtr/pdu.c | 10 ++-
lib/rpki/querySupport.c | 9 ++-
lib/rpki/sqcon.c | 17 ++---
lib/util/queue.h | 4 +-
tests/conformance/rfc3779/Instructions | 19 +++---
tests/conformance/rfc3779/convert_tc.py.in | 34 +++++++---
tests/conformance/rfc3779/convert_tc.py.readme | 49 ++++++++------
tests/subsystem/rpki-asn1/test_casn_random.c | 3 +-
.../testDriver/src/com/bbn/rpki/test/Doc.txt | 8 ++-
.../bbn/rpki/test/model/DependencyDescription.java | 3 +-
.../com/bbn/rpki/test/model/TaskDescription.java | 6 +-
.../src/com/bbn/rpki/test/model/TestModel.java | 24 ++++---
.../bbn/rpki/test/ui/ArgDescriptionsEditor.java | 13 ++--
tests/system/testbed/src/create_objects.py.in | 78 ++++++++++++++--------
tests/test.include.in | 12 +++-
20 files changed, 246 insertions(+), 143 deletions(-)
diff --git a/lib/config/config.c b/lib/config/config.c
index 320f88c..a8ccbb7 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -20,7 +20,8 @@ static const struct config_option config_options[] = {
"RPKIPort",
false,
config_type_sscanf_converter, &config_type_sscanf_arg_uint16_t,
- config_type_sscanf_converter_inverse,
&config_type_sscanf_inverse_arg_uint16_t,
+ config_type_sscanf_converter_inverse,
+ &config_type_sscanf_inverse_arg_uint16_t,
free,
NULL, NULL,
"7344"},
@@ -90,7 +91,8 @@ static const struct config_option config_options[] = {
"DownloadConcurrency",
false,
config_type_sscanf_converter, &config_type_sscanf_arg_size_t,
- config_type_sscanf_converter_inverse,
&config_type_sscanf_inverse_arg_size_t,
+ config_type_sscanf_converter_inverse,
+ &config_type_sscanf_inverse_arg_size_t,
free,
NULL, NULL,
"24"},
@@ -173,7 +175,8 @@ static const struct config_option config_options[] = {
config_type_string_converter_inverse, NULL,
free,
NULL, NULL,
- "\"https://rpki.bbn.com/check-version?package="; PACKAGE_NAME "&version="
PACKAGE_VERSION "\""},
+ "\"https://rpki.bbn.com/check-version?package="; PACKAGE_NAME
+ "&version=" PACKAGE_VERSION "\""},
// CONFIG_NEW_VERSION_CHECK_CA_CERT
{
@@ -260,7 +263,8 @@ static const struct config_option config_options[] = {
"LogRetention",
false,
config_type_sscanf_converter, &config_type_sscanf_arg_size_t,
- config_type_sscanf_converter_inverse,
&config_type_sscanf_inverse_arg_size_t,
+ config_type_sscanf_converter_inverse,
+ &config_type_sscanf_inverse_arg_size_t,
free,
NULL, NULL,
"9"},
diff --git a/lib/configlib/config_load.c b/lib/configlib/config_load.c
index 7eeb444..e4dddb3 100644
--- a/lib/configlib/config_load.c
+++ b/lib/configlib/config_load.c
@@ -56,8 +56,12 @@ static void skip_comment(
/**
Get the option from the beginning of a line.
- @param line_offset Input/output param for offset within line before/after
the option name.
- @param[out] option Return value of the parsed option, or CONFIG_OPTION_NONE
if it's an empty line.
+ @param line_offset
+ Input/output param for offset within line before/after the
+ option name.
+ @param[out] option
+ Return value of the parsed option, or CONFIG_OPTION_NONE if
+ it's an empty line.
@return True on success, false on error.
*/
static bool get_option(
@@ -120,9 +124,13 @@ static bool get_option(
/**
Get the next value to an option.
- @param line The line itself.
- @param line_offset Input/output param for offset within line before/after
the option value.
- @param[out] value Return a malloc()-allocated buffer with the option value.
+ @param line
+ The line itself.
+ @param line_offset
+ Input/output param for offset within line before/after the
+ option value.
+ @param[out] value
+ Return a malloc()-allocated buffer with the option value.
@return True on success, false on error.
*/
static bool get_value(
@@ -272,9 +280,10 @@ static bool get_value(
{
if (line[*line_offset + 1] != '{')
{
- config_message(context, LOG_ERR,
- "currently, only variable substitution of the
form ${FOO} "
- "is supported. The form $FOO is not
supported.");
+ config_message(
+ context, LOG_ERR,
+ "currently, only variable substitution of the form ${FOO} "
+ "is supported. The form $FOO is not supported.");
ret = false;
goto done;
}
@@ -306,9 +315,10 @@ static bool get_value(
if (variable_value == NULL)
{
variable_value = "";
- config_message(context, LOG_WARNING,
- "variable ${%s} not found, using the empty
string instead",
- variable);
+ config_message(
+ context, LOG_WARNING,
+ "variable ${%s} not found, using the empty string instead",
+ variable);
}
free(variable);
@@ -482,7 +492,8 @@ static bool convert_values(
}
free(config_value->value.array_value.data);
- config_value->value.array_value.data = malloc(sizeof(void *) *
num_values);
+ config_value->value.array_value.data =
+ malloc(sizeof(void *) * num_values);
if (config_value->value.array_value.data == NULL)
{
LOG(LOG_ERR, "out of memory");
@@ -493,14 +504,12 @@ static bool convert_values(
config_value->value.array_value.num_items < num_values;
++config_value->value.array_value.num_items)
{
- if (!config_option->value_convert(context,
- config_option->
- value_convert_usr_arg,
-
values[config_value->value.array_value.
- num_items],
- &config_value->value.array_value.
-
data[config_value->value.array_value.
- num_items]))
+ if (!config_option->value_convert(
+ context,
+ config_option->value_convert_usr_arg,
+ values[config_value->value.array_value.num_items],
+ &config_value->value.array_value.data[
+ config_value->value.array_value.num_items]))
{
return false;
}
@@ -508,13 +517,11 @@ static bool convert_values(
if (config_option->array_validate != NULL)
{
- if (!config_option->array_validate(context,
- config_option->
- array_validate_usr_arg,
- (void const *const *)
-
config_value->value.array_value.data,
- config_value->value.array_value.
- num_items))
+ if (!config_option->array_validate(
+ context,
+ config_option->array_validate_usr_arg,
+ (void const *const *)config_value->value.array_value.data,
+ config_value->value.array_value.num_items))
{
return false;
}
@@ -542,10 +549,11 @@ static bool convert_values(
config_option->value_free(config_value->value.single_value.data);
config_value->value.single_value.data = NULL;
- if (!config_option->value_convert(context,
- config_option->value_convert_usr_arg,
- value,
-
&config_value->value.single_value.data))
+ if (!config_option->value_convert(
+ context,
+ config_option->value_convert_usr_arg,
+ value,
+ &config_value->value.single_value.data))
{
return false;
}
diff --git a/lib/configlib/configlib.c b/lib/configlib/configlib.c
index f1008c8..98b7020 100644
--- a/lib/configlib/configlib.c
+++ b/lib/configlib/configlib.c
@@ -159,7 +159,8 @@ void config_message(
file_context != NULL;
file_context = file_context->includes)
{
- if (file_context->includes != NULL && file_context->includes->line
!= 0)
+ if (file_context->includes != NULL
+ && file_context->includes->line != 0)
{
LOG(priority, "In config file included from %s:%zu:",
file_context->file, file_context->line);
@@ -290,7 +291,8 @@ void config_unload(
}
else
{
-
config_options[i].value_free(config_values[i].value.single_value.data);
+ config_options[i].value_free(
+ config_values[i].value.single_value.data);
}
}
diff --git a/lib/configlib/configlib.h b/lib/configlib/configlib.h
index 003b554..baba2da 100644
--- a/lib/configlib/configlib.h
+++ b/lib/configlib/configlib.h
@@ -176,7 +176,8 @@ char ** config_get_string_array(
For an array of strings type CONFIG_FOO, this code:
// in some function body
- char const * const * foo = (char const * const
*)config_get_array(CONFIG_FOO);
+ char const * const * foo =
+ (char const * const *)config_get_array(CONFIG_FOO);
const char * foo_0 = foo[0];
Is equivalent to this:
@@ -213,7 +214,8 @@ char ** config_get_string_array(
For an array of ints type CONFIG_FOO, this code:
// in some function body
- int const * const * foo = (int const * const
*)config_get_array(CONFIG_FOO);
+ int const * const * foo =
+ (int const * const *)config_get_array(CONFIG_FOO);
int foo_0 = *foo[0];
Is equivalent to this:
diff --git a/lib/configlib/configlib_type.h b/lib/configlib/configlib_type.h
index 45ecbb2..003cb1f 100644
--- a/lib/configlib/configlib_type.h
+++ b/lib/configlib/configlib_type.h
@@ -26,9 +26,11 @@ bool config_context_is_default(
/**
- Callback for config type functions to use to log messages about their
config item.
+ Callback for config type functions to use to log messages about
+ their config item.
- @param context Opaque data. Might include things like line number in the
config file.
+ @param context Opaque data. Might include things like line number
+ in the config file.
@param priority See syslog(3).
*/
void config_message(
diff --git a/lib/rpki-rtr/pdu.c b/lib/rpki-rtr/pdu.c
index 70fce0f..f55e303 100644
--- a/lib/rpki-rtr/pdu.c
+++ b/lib/rpki-rtr/pdu.c
@@ -585,7 +585,9 @@ void pdu_sprint(
do { \
if (offset < PDU_SPRINT_BUFSZ) \
{ \
- int SNPRINTF_ret = snprintf(buffer + offset, PDU_SPRINT_BUFSZ -
offset, format, ## __VA_ARGS__); \
+ int SNPRINTF_ret = snprintf(buffer + offset, \
+ PDU_SPRINT_BUFSZ - offset, \
+ format, ## __VA_ARGS__); \
if (SNPRINTF_ret < 0) \
{ \
abort(); \
@@ -622,7 +624,8 @@ void pdu_sprint(
do { \
if (offset + INET_ADDRSTRLEN < PDU_SPRINT_BUFSZ) \
{ \
- if (inet_ntop(AF_INET, &(ip), buffer + offset, PDU_SPRINT_BUFSZ -
offset) == NULL) \
+ if (inet_ntop(AF_INET, &(ip), buffer + offset, \
+ PDU_SPRINT_BUFSZ - offset) == NULL) \
{ \
SNPRINTF("(ERROR)"); \
} \
@@ -642,7 +645,8 @@ void pdu_sprint(
do { \
if (offset + INET6_ADDRSTRLEN < PDU_SPRINT_BUFSZ) \
{ \
- if (inet_ntop(AF_INET6, &(ip), buffer + offset, PDU_SPRINT_BUFSZ -
offset) == NULL) \
+ if (inet_ntop(AF_INET6, &(ip), buffer + offset, \
+ PDU_SPRINT_BUFSZ - offset) == NULL) \
{ \
SNPRINTF("(ERROR)"); \
} \
diff --git a/lib/rpki/querySupport.c b/lib/rpki/querySupport.c
index 77e80a5..8ffd834 100644
--- a/lib/rpki/querySupport.c
+++ b/lib/rpki/querySupport.c
@@ -120,7 +120,11 @@ int checkValidity(
{
int len = strlen(validWhereStr);
xsnprintf(&validWhereStr[len], WHERESTR_SIZE - len,
- " and (((flags%%%d)>=%d) or ((flags%%%d)<%d) or
((flags%%%d)>=%d))",
+ " and ("
+ "((flags%%%d)>=%d)"
+ " or ((flags%%%d)<%d)"
+ " or ((flags%%%d)>=%d)"
+ ")",
2 * SCM_FLAG_ONMAN, SCM_FLAG_ONMAN, 2 * SCM_FLAG_CA,
SCM_FLAG_CA, 2 * SCM_FLAG_TRUSTED, SCM_FLAG_TRUSTED);
}
@@ -744,7 +748,8 @@ static QueryField fields[] = {
{
"flags",
"which flags are set in the database",
- Q_JUST_DISPLAY | Q_FOR_CERT | Q_FOR_CRL | Q_FOR_ROA | Q_FOR_MAN |
Q_FOR_GBR,
+ Q_JUST_DISPLAY | Q_FOR_CERT | Q_FOR_CRL
+ | Q_FOR_ROA | Q_FOR_MAN | Q_FOR_GBR,
SQL_C_ULONG, 8,
NULL, NULL,
"Flags Set", displayFlags,
diff --git a/lib/rpki/sqcon.c b/lib/rpki/sqcon.c
index b6fa2ad..0ba8847 100644
--- a/lib/rpki/sqcon.c
+++ b/lib/rpki/sqcon.c
@@ -1122,17 +1122,12 @@ void addFlagTest(
* or < 0x04 (in which case bit 0x04 is not set).
*/
int len = strlen(whereStr);
- xsnprintf(&whereStr[len], WHERESTR_SIZE - len, "%s ((flags%%%d)%s%d)",
needAnd ? " and" : "", 2 * flagVal /* 2x
-
* since
-
* we
-
* are
-
* doing
-
* flag
-
* mod
-
* this
-
* value
-
*/ ,
- isSet ? ">=" : "<", flagVal);
+ xsnprintf(&whereStr[len], WHERESTR_SIZE - len,
+ "%s ((flags%%%d)%s%d)",
+ needAnd ? " and" : "",
+ 2 * flagVal, /* 2x since we are doing flag mod this value */
+ isSet ? ">=" : "<",
+ flagVal);
}
/*
diff --git a/lib/util/queue.h b/lib/util/queue.h
index abd1b5f..2ae212d 100644
--- a/lib/util/queue.h
+++ b/lib/util/queue.h
@@ -36,7 +36,9 @@ bool Queue_trypop(
/**
Push data onto the queue.
- @return Whether or not the push was successful. (It can fail if there
isn't enough memory.)
+ @return
+ Whether or not the push was successful. (It can fail if there
+ isn't enough memory.)
@param data The data to put on the queue. This must be a
pointer to heap-allocated memory. The user is
responsible for freeing this memory; Queue
diff --git a/tests/conformance/rfc3779/Instructions
b/tests/conformance/rfc3779/Instructions
index fe43864..b3491cf 100644
--- a/tests/conformance/rfc3779/Instructions
+++ b/tests/conformance/rfc3779/Instructions
@@ -1,12 +1,13 @@
Instructions for use of Test Cases
-The test cases consist of files with suffixes ".cer" and ".raw", where a
-".cer" file is a certificate and a ".raw" file is a human readable version of
-the corresponding ".cer" file. File names consist of one or more letters
-followed by the number of the test case described in the README document. The
-prefix letters are "P", "C", "GC"and "GGC". There are also files suffixed with
-"p15" which contain signing keys.
+The test cases consist of files with suffixes ".cer" and ".raw", where
+a ".cer" file is a certificate and a ".raw" file is a human readable
+version of the corresponding ".cer" file. File names consist of one
+or more letters followed by the number of the test case described in
+the README document. The prefix letters are "P", "C", "GC"and "GGC".
+There are also files suffixed with "p15" which contain signing keys.
-To run the tests, first execute the python program creat_cert.py, which
-generates new ".cer" files with refreshed beginning and end dates. Then
execute the python program run_tests.py, which runs all the tests, stopping at
the
-first error encountered.
+To run the tests, first execute the python program creat_cert.py,
+which generates new ".cer" files with refreshed beginning and end
+dates. Then execute the python program run_tests.py, which runs all
+the tests, stopping at the first error encountered.
diff --git a/tests/conformance/rfc3779/convert_tc.py.in
b/tests/conformance/rfc3779/convert_tc.py.in
index dabd275..37124e9 100644
--- a/tests/conformance/rfc3779/convert_tc.py.in
+++ b/tests/conformance/rfc3779/convert_tc.py.in
@@ -1,8 +1,8 @@
#!@PYTHON@
#
-# This file is meant to switch all of these rfc3779 test cases into a more
widely distributed
-# system of testcasese that will validate and chain when entered into the
database through
-# rcli.
+# This file is meant to switch all of these rfc3779 test cases into a
+# more widely distributed system of testcasese that will validate and
+# chain when entered into the database through rcli.
#
#
#
@@ -94,8 +94,14 @@ for file in fileList:
# Handle the special 6.3.4* testcases and the A51RI*(section 5.1) testcases
- if file[-10:] == '6.3.4a.cer' or file[-10:]=='6.3.4b.cer' or
file[-10:]=='6.3.6a.cer' or \
- file[-10:]=='6.3.6b.cer' or file[-10:]=='A51RIG.cer' or
file[-10:]=='A51RIB.cer':
+ if file[-10:] in (
+ '6.3.4a.cer',
+ '6.3.4b.cer',
+ '6.3.6a.cer',
+ '6.3.6b.cer',
+ 'A51RIG.cer',
+ 'A51RIB.cer',
+ ):
if file[0] == 'P':
parentKeyFile = 'test/R.cer.p15'
parent = 'R.cer'
@@ -134,8 +140,20 @@ for file in fileList:
aia = uri + parent
sia = "r:" + uri
- # call ./create_object with all above as args and a generated this
file.cer as the template.
- cmd = "../../testbed/src/create_object CERTIFICATE type=ca serial=%s
subject=%s issuer=%s aki=%s ski=%s template=%s subjKeyFile=%s
outputfilename=./test/%s parentKeyFile=%s sia=%s aia=%s" \
- % (serialNumber, subjectName, issuer, aki, ski, file, "test/" +
file+".p15", file, parentKeyFile, sia, aia)
+ # call ./create_object with all above as args and a generated this
+ # file.cer as the template.
+ cmd = "../../testbed/src/create_object CERTIFICATE" \
+ + " type=ca" \
+ + " serial=" + serialNumber \
+ + " subject=" + subjectName \
+ + " issuer=" + issuer \
+ + " aki=" + aki \
+ + " ski=" + ski \
+ + " template=" + file \
+ + " subjKeyFile=test/" + file + ".p15" \
+ + " outputfilename=./test/" + file \
+ + " parentKeyFile=" + parentKeyFile \
+ + " sia=" + sia \
+ + " aia=" + aia
print cmd
os.system(cmd)
diff --git a/tests/conformance/rfc3779/convert_tc.py.readme
b/tests/conformance/rfc3779/convert_tc.py.readme
index bc0186e..47999b8 100644
--- a/tests/conformance/rfc3779/convert_tc.py.readme
+++ b/tests/conformance/rfc3779/convert_tc.py.readme
@@ -1,15 +1,18 @@
-The convert_tc.py script was created to convert existing RFC 3779 test cases
-into something that would validate and chain in a hierarchy. Currently, all
-the testcases are sitting in the testcases/rfc3779 directory as .raw files.
-These files are not chained or validated in any sense of a hierarchy. The
test for
-these involves removing and adding specific files in order to test one of the
cases.
-Several steps need to be taken in order to convert these .raw files into useful
-.cer files that have a hierarchy. The steps below online what needs to be
done.
+The convert_tc.py script was created to convert existing RFC 3779 test
+cases into something that would validate and chain in a hierarchy.
+Currently, all the testcases are sitting in the testcases/rfc3779
+directory as .raw files. These files are not chained or validated in
+any sense of a hierarchy. The test for these involves removing and
+adding specific files in order to test one of the cases. Several
+steps need to be taken in order to convert these .raw files into
+useful .cer files that have a hierarchy. The steps below online what
+needs to be done.
-This script takes all .cer files from the directory and uses them as templates
-for the create_object binary in testbed/src. It only changes the serial
number,
-SIA, AIA, ski, aki, issuer name, and subject name. It then signs the newly
-generated certs with the .p15 files that it will generate if desired.
+This script takes all .cer files from the directory and uses them as
+templates for the create_object binary in testbed/src. It only
+changes the serial number, SIA, AIA, ski, aki, issuer name, and
+subject name. It then signs the newly generated certs with the .p15
+files that it will generate if desired.
STEP
@@ -17,22 +20,26 @@ STEP
1) convert all raw files to cer files
../tools/create_cert.py "*.raw"
-2) make a test directory, literally use the name test, this script expects a
directory name test
+2) make a test directory, literally use the name test, this script
+ expects a directory name test
mkdir -p test
-3) if this is the first time you are running this, uncomment the gen_key for
loop
- section of the python script so that it will create .p15's for you. You can
- comment this out to speed up future runs as you do not need to create key's
- everytime this scrit is run.
+3) if this is the first time you are running this, uncomment the
+ gen_key for loop section of the python script so that it will
+ create .p15's for you. You can comment this out to speed up future
+ runs as you do not need to create key's everytime this scrit is
+ run.
4) run this script
python convert_tc.py
-5) You may need to specifically edit the R.cer or other specific files
depending on what
- you are trying to generate. Be sure to re-sign the cert with the correct
.p15
+5) You may need to specifically edit the R.cer or other specific files
+ depending on what you are trying to generate. Be sure to re-sign
+ the cert with the correct .p15
-The massive sets of IF statements in the script are there in order to properly
set who
-the parent is for each testcase. This looks rather complex, but it was
developed by
-reading the README in the rfc3779 directory.
+The massive sets of IF statements in the script are there in order to
+properly set who the parent is for each testcase. This looks rather
+complex, but it was developed by reading the README in the rfc3779
+directory.
diff --git a/tests/subsystem/rpki-asn1/test_casn_random.c
b/tests/subsystem/rpki-asn1/test_casn_random.c
index b1c5dc5..1d96db0 100644
--- a/tests/subsystem/rpki-asn1/test_casn_random.c
+++ b/tests/subsystem/rpki-asn1/test_casn_random.c
@@ -28,7 +28,8 @@
t(&guy, (ushort)0); \
ret = get_casn_file(&guy.self, filename, 0) ; \
if (ret >= 0) { \
- printf("accepted %s as a " #t " (should have failed)\n",
filename); \
+ printf("accepted %s as a " #t " (should have failed)\n", \
+ filename); \
} \
}
diff --git a/tests/system/testDriver/src/com/bbn/rpki/test/Doc.txt
b/tests/system/testDriver/src/com/bbn/rpki/test/Doc.txt
index 5ce0b29..251024a 100644
--- a/tests/system/testDriver/src/com/bbn/rpki/test/Doc.txt
+++ b/tests/system/testDriver/src/com/bbn/rpki/test/Doc.txt
@@ -26,10 +26,12 @@ Primitive tasks may be composed into activities. This
process is
Representing Sequentiality, Parallelism and Iteration
Sequentiality is represented by lists. Parallelism is represented by
-collections. Iteration is represented Activity is recursively represented by
alternations of
-these simple structures using singletons for degenerate cases.
+collections. Iteration is represented Activity is recursively
+represented by alternations of these simple structures using
+singletons for degenerate cases.
Representing the System Under Test
The system under test is specified in terms of a description of every
-component including the other components with which it is associated. Each
component
+component including the other components with which it is associated.
+Each component
diff --git
a/tests/system/testDriver/src/com/bbn/rpki/test/model/DependencyDescription.java
b/tests/system/testDriver/src/com/bbn/rpki/test/model/DependencyDescription.java
index 8659746..3f64d0a 100644
---
a/tests/system/testDriver/src/com/bbn/rpki/test/model/DependencyDescription.java
+++
b/tests/system/testDriver/src/com/bbn/rpki/test/model/DependencyDescription.java
@@ -13,5 +13,6 @@ import java.util.Collection;
*/
public class DependencyDescription {
private XMLBase successorTaskDescription;
- private final Collection<TaskDescription> predecessorTaskDescriptions = new
ArrayList<TaskDescription>();
+ private final Collection<TaskDescription> predecessorTaskDescriptions =
+ new ArrayList<TaskDescription>();
}
diff --git
a/tests/system/testDriver/src/com/bbn/rpki/test/model/TaskDescription.java
b/tests/system/testDriver/src/com/bbn/rpki/test/model/TaskDescription.java
index 894fe07..26877d1 100644
--- a/tests/system/testDriver/src/com/bbn/rpki/test/model/TaskDescription.java
+++ b/tests/system/testDriver/src/com/bbn/rpki/test/model/TaskDescription.java
@@ -30,7 +30,8 @@ public class TaskDescription extends XMLBase {
private String name;
private final String description;
private File scriptFile;
- private final List<ArgDescription> argDescriptions = new
ArrayList<ArgDescription>();
+ private final List<ArgDescription> argDescriptions =
+ new ArrayList<ArgDescription>();
/**
* @param name
* @param description
@@ -48,7 +49,8 @@ public class TaskDescription extends XMLBase {
this.name = element.getAttributeValue(ATTR_NAME);
this.description = element.getChildText(TAG_DESCRIPTION);
this.scriptFile = new File(element.getChildText(TAG_SCRIPT_FILE));
- List<Element> argDescriptionElements = getChildren(element,
TAG_ARG_DESCRIPTION);
+ List<Element> argDescriptionElements =
+ getChildren(element, TAG_ARG_DESCRIPTION);
for (Element argDescriptionElement : argDescriptionElements) {
ArgDescription argDescription = new
ArgDescription(argDescriptionElement);
argDescriptions.add(argDescription);
diff --git a/tests/system/testDriver/src/com/bbn/rpki/test/model/TestModel.java
b/tests/system/testDriver/src/com/bbn/rpki/test/model/TestModel.java
index e969475..8dca1ea 100644
--- a/tests/system/testDriver/src/com/bbn/rpki/test/model/TestModel.java
+++ b/tests/system/testDriver/src/com/bbn/rpki/test/model/TestModel.java
@@ -16,7 +16,8 @@ import org.jdom.Element;
*/
public class TestModel extends XMLBase {
private static final String TAG_TASK_DESCRIPTION = "task-description";
- private final Map<String, TaskDescription> taskDescriptions = new
TreeMap<String, TaskDescription>();
+ private final Map<String, TaskDescription> taskDescriptions =
+ new TreeMap<String, TaskDescription>();
private boolean modified;
/**
@@ -43,8 +44,10 @@ public class TestModel extends XMLBase {
* @param element
*/
public TestModel(Element element) {
- for (Element taskDescriptionElement : getChildren(element,
TAG_TASK_DESCRIPTION)) {
- TaskDescription taskDescription = new
TaskDescription(taskDescriptionElement);
+ for (Element taskDescriptionElement :
+ getChildren(element, TAG_TASK_DESCRIPTION)) {
+ TaskDescription taskDescription =
+ new TaskDescription(taskDescriptionElement);
taskDescriptions.put(taskDescription.getName(), taskDescription);
}
setModified(false);
@@ -74,7 +77,8 @@ public class TestModel extends XMLBase {
public String genNewTaskName() {
int suffix = 0;
while (true) {
- String name = "New Task" + (suffix == 0 ? "" : String.format("(%d)",
suffix));
+ String name =
+ "New Task" + (suffix == 0 ? "" : String.format("(%d)", suffix));
if (!taskDescriptions.containsKey(name)) return name;
suffix++;
}
@@ -83,12 +87,16 @@ public class TestModel extends XMLBase {
/**
* @param newName
* @param selectedTaskDescription
- * @return null if successful else the reason the rename could not be
performed
+ * @return null if successful else the reason the rename could not
+ * be performed
*/
- public String renameTaskDescription(String newName, TaskDescription
selectedTaskDescription) {
+ public String renameTaskDescription(
+ String newName, TaskDescription selectedTaskDescription) {
TaskDescription namedTaskDescription = taskDescriptions.get(newName);
- if (namedTaskDescription != null && namedTaskDescription !=
selectedTaskDescription) {
- return String.format("Another task description named %s already exists",
newName);
+ if (namedTaskDescription != null
+ && namedTaskDescription != selectedTaskDescription) {
+ return String.format(
+ "Another task description named %s already exists", newName);
}
taskDescriptions.remove(selectedTaskDescription.getName());
selectedTaskDescription.setName(newName);
diff --git
a/tests/system/testDriver/src/com/bbn/rpki/test/ui/ArgDescriptionsEditor.java
b/tests/system/testDriver/src/com/bbn/rpki/test/ui/ArgDescriptionsEditor.java
index da06f5a..d68a97d 100644
---
a/tests/system/testDriver/src/com/bbn/rpki/test/ui/ArgDescriptionsEditor.java
+++
b/tests/system/testDriver/src/com/bbn/rpki/test/ui/ArgDescriptionsEditor.java
@@ -34,8 +34,10 @@ public class ArgDescriptionsEditor extends PropertiesEditor {
private ArgDescription argDescription;
ArgComponents(ActionListener editAction) {
- argName.setToolTipText("Enter the name by which this argument will be
referenced");
- isParameter.setToolTipText("Select if this argument should always have
the specified value");
+ argName.setToolTipText(
+ "Enter the name by which this argument will be referenced");
+ isParameter.setToolTipText(
+ "Select if this argument should always have the specified value");
editButton = new JButton("Add");
editButton.addActionListener(editAction);
argName.addFocusListener(new FocusAdapter() {
@@ -108,7 +110,8 @@ public class ArgDescriptionsEditor extends PropertiesEditor
{
*/
private void updateToolTips() {
boolean parameter = argDescription.isParameter();
- argValue.setToolTipText(parameter ? "Specifies a constant value for this
argument" :
+ argValue.setToolTipText(
+ parameter ? "Specifies a constant value for this argument" :
"Specifies a default value for this argument");
}
}
@@ -119,7 +122,9 @@ public class ArgDescriptionsEditor extends PropertiesEditor
{
* Initialize fields
*/
public ArgDescriptionsEditor() {
- addComponentsToTaskPanel(new JLabel("Arg Name"), new JLabel("Parameter"),
new JLabel("Arg Value"), new JLabel("Action"));
+ addComponentsToTaskPanel(
+ new JLabel("Arg Name"), new JLabel("Parameter"),
+ new JLabel("Arg Value"), new JLabel("Action"));
for (int i = 0; i < argComponentsArray.length; i++) {
final int index = i;
ActionListener editAction = new ActionListener() {
diff --git a/tests/system/testbed/src/create_objects.py.in
b/tests/system/testbed/src/create_objects.py.in
index 4e3e540..8aa9eb0 100644
--- a/tests/system/testbed/src/create_objects.py.in
+++ b/tests/system/testbed/src/create_objects.py.in
@@ -19,14 +19,16 @@ SECONDS_IN_DAY = 86400
# that will be fed to the create_object code
#
def writeConfig(obj):
- # Use introspection to print out all the member variables and their values
to a file
+ # Use introspection to print out all the member variables and
+ # their values to a file
if not os.path.exists(CONFIG_PATH):
os.system('mkdir -p ' + CONFIG_PATH)
fn = obj.outputfilename.split('/')
file = fn[-1]
f = open(CONFIG_PATH + file + ".cfg", 'w')
- # Gets all the attributes of this class that are only member variables
(not functions)
+ # Gets all the attributes of this class that are only member
+ # variables(not functions)
members = [attr for attr in dir(obj) if not callable(getattr(obj,attr))
and not attr.startswith("__")]
@@ -68,17 +70,22 @@ def writeConfig(obj):
fileBuf += '%s=%s\n' % (member, ",".join(val))
elif member == 'notBefore' or member == 'notAfter':
if val.year < 2050:
- fileBuf += '%s=%s\n' %
(member,val.strftime("%y%m%d%H%M%SZ"))
+ fileBuf += '%s=%s\n' \
+ % (member,val.strftime("%y%m%d%H%M%SZ"))
else:
- fileBuf += '%s=%s\n' %
(member,val.strftime("%Y%m%d%H%M%SZ"))
+ fileBuf += '%s=%s\n' \
+ % (member,val.strftime("%Y%m%d%H%M%SZ"))
elif member == 'thisupdate' or member == 'nextupdate':
if isinstance(obj,Manifest):
- fileBuf += '%s=%s\n' %
(member,val.strftime("%Y%m%d%H%M%SZ"))
+ fileBuf += '%s=%s\n' \
+ % (member,val.strftime("%Y%m%d%H%M%SZ"))
else:
if val.year < 2050:
- fileBuf += '%s=%s\n' %
(member,val.strftime("%y%m%d%H%M%SZ"))
+ fileBuf += '%s=%s\n' \
+ % (member,val.strftime("%y%m%d%H%M%SZ"))
else:
- fileBuf += '%s=%s\n' %
(member,val.strftime("%Y%m%d%H%M%SZ"))
+ fileBuf += '%s=%s\n' \
+ % (member,val.strftime("%Y%m%d%H%M%SZ"))
elif member == 'fileList':
fileBuf += '%s=%s\n' % (member, ','.join(val))
else:
@@ -161,7 +168,8 @@ class Certificate:
#Certificate lifetime and expiration info
self.notBefore = datetime.datetime.utcnow()
- self.notAfter =
datetime.datetime.fromtimestamp(time()+myFactory.ttl*SECONDS_IN_DAY)
+ self.notAfter = datetime.datetime.fromtimestamp(
+ time()+myFactory.ttl*SECONDS_IN_DAY)
#Set our subject key file name and generate the key
#Also check the directory first, and create it if it doesn't exist
@@ -249,12 +257,15 @@ class CA_cert(Certificate):
#setup our cert addresses for rsync
- # For aia cut off the portion that contains the repoitory path to
create an rsync url
- self.crldp =
"rsync://"+parent.SIA_path+"/"+b64encode_wrapper(parent.certificate.ski)+".crl"
+ # For aia cut off the portion that contains the repoitory path
+ # to create an rsync url
+ self.crldp = "rsync://"+parent.SIA_path+"/" \
+ +b64encode_wrapper(parent.certificate.ski)+".crl"
self.aia = "rsync://"+parent.path_CA_cert[len(REPO_PATH)+1:]
Certificate.__init__(self,parent, myFactory,sia_path,serial,
ipv4,ipv6,as_list, subjkeyfile=subjkeyfile)
- self.sia =
"r:rsync://"+sia_path+"/,m:rsync://"+sia_path+"/"+b64encode_wrapper(self.ski)+".mft"
+ self.sia = "r:rsync://"+sia_path+"/,m:rsync://"+sia_path+"/" \
+ +b64encode_wrapper(self.ski)+".mft"
writeConfig(self)
create_binary(self, "CERTIFICATE selfsigned=False")
@@ -270,19 +281,22 @@ class EE_cert(Certificate):
path_sia = parent.SIA_path+"/"+nickName
self.aia = "rsync://"+parent.path_CA_cert[len(REPO_PATH)+1:]
- self.crldp =
"rsync://"+parent.SIA_path+"/"+b64encode_wrapper(parent.certificate.ski)+".crl"
+ self.crldp = "rsync://"+parent.SIA_path+"/" \
+ +b64encode_wrapper(parent.certificate.ski)+".crl"
Certificate.__init__(self,parent,myFactory,path_sia,serial,
ipv4,ipv6,as_list)
#Set our SIA based on the hash of our public key, which will be the
name
#of the ROA or Manifest this EE will be signing
if myFactory.bluePrintName == "Manifest-EE":
- self.sia =
"s:rsync://"+parent.SIA_path+"/"+b64encode_wrapper(parent.certificate.ski)+".mft"
+ self.sia = "s:rsync://"+parent.SIA_path+"/" \
+ +b64encode_wrapper(parent.certificate.ski)+".mft"
self.ipv4 = ["inherit"]
self.ipv6 = ["inherit"]
self.as_list = ["inherit"]
else:
- self.sia =
"s:rsync://"+parent.SIA_path+"/"+b64encode_wrapper(self.ski)+".roa"
+ self.sia = "s:rsync://"+parent.SIA_path+"/" \
+ +b64encode_wrapper(self.ski)+".roa"
writeConfig(self)
create_binary(self, "CERTIFICATE selfsigned=False")
@@ -301,7 +315,8 @@ class SS_cert(Certificate):
sia_path = myFactory.serverName + "/"+nickName
Certificate.__init__(self,parent,myFactory,sia_path,serial,
subjkeyfile=subjkeyfile)
- self.sia =
"r:rsync://"+sia_path+"/,m:rsync://"+sia_path+"/"+b64encode_wrapper(self.ski)+".mft"
+ self.sia = "r:rsync://"+sia_path+"/,m:rsync://"+sia_path+"/" \
+ +b64encode_wrapper(self.ski)+".mft"
writeConfig(self)
create_binary(self, "CERTIFICATE selfsigned=True")
@@ -323,9 +338,11 @@ class Manifest(CMS):
self.manNum = eeCertificate.serial
self.thisupdate = datetime.datetime.utcnow()
#Not sure on this nextUpdate time frame
- self.nextupdate =
datetime.datetime.fromtimestamp(time()+parent.myFactory.ttl*SECONDS_IN_DAY)
+ self.nextupdate = datetime.datetime.fromtimestamp(
+ time()+parent.myFactory.ttl*SECONDS_IN_DAY)
#Chop off our rsync:// portion and append the repo path
- self.outputfilename =
REPO_PATH+"/"+parent.SIA_path+"/"+b64encode_wrapper(parent.certificate.ski)+".mft"
+ self.outputfilename = REPO_PATH+"/"+parent.SIA_path+"/" \
+ +b64encode_wrapper(parent.certificate.ski)+".mft"
dirname = REPO_PATH+"/"+parent.SIA_path
fileList = []
@@ -334,7 +351,8 @@ class Manifest(CMS):
fileList.append(f+"%"+generate_file_hash(dirname+"/"+f))
self.fileList = fileList
- CMS.__init__(self,
eeCertificate.outputfilename,eeCertificate.subjkeyfile)
+ CMS.__init__(self, eeCertificate.outputfilename,
+ eeCertificate.subjkeyfile)
writeConfig(self)
create_binary(self, "MANIFEST")
@@ -357,7 +375,8 @@ class Roa(CMS):
#Can safely remove this if it works in the main loop
#if not os.path.exists(dir_path):
# os.system("mkdir -p "+ dir_path)
- CMS.__init__(self, ee_object.certificate.outputfilename,
ee_object.certificate.subjkeyfile)
+ CMS.__init__(self, ee_object.certificate.outputfilename,
+ ee_object.certificate.subjkeyfile)
writeConfig(self)
create_binary(self, "ROA")
@@ -373,14 +392,16 @@ class Crl:
self.issuer = parent.commonName
self.thisupdate = datetime.datetime.utcnow()
#Not sure on this nextUpdate time frame
- self.nextupdate =
datetime.datetime.fromtimestamp(time()+parent.myFactory.ttl*SECONDS_IN_DAY)
+ self.nextupdate = datetime.datetime.fromtimestamp(
+ time()+parent.myFactory.ttl*SECONDS_IN_DAY)
self.crlnum = parent.getNextChildSN()
self.revokedcertlist = []
self.aki = parent.certificate.ski
#Create the output file directory if it doesn't exist
dir_path = REPO_PATH+"/"+parent.SIA_path+"/"
- self.outputfilename =
dir_path+b64encode_wrapper(parent.certificate.ski)+".crl"
+ self.outputfilename = dir_path+b64encode_wrapper(
+ parent.certificate.ski)+".crl"
writeConfig(self)
create_binary(self, "CRL")
@@ -400,7 +421,8 @@ def main():
'../templates/EE.p15',
'../templates/TA.p15',
['1.2.3.4-1.2.5.255','10.0.5/24', '10.0.4.0-10.0.5.249'],
- ['0a00:0080/25',
'2220::/13,3330::/13','1111:1111::/32','2222::-2223::'],
+ ['0a00:0080/25', '2220::/13,3330::/13','1111:1111::/32',
+ '2222::-2223::'],
'1-16,40,33,22,60-156',
'c.cer')
@@ -414,10 +436,12 @@ def main():
'../templates/EE.p15',
'../templates/TA.p15',
['1.2.3.4-1.2.5.255','10.0.5/24', '10.0.4.0-10.0.5.249'],
- ['0a00:0080/25',
'2220::/13,3330::/13','1111:1111::/32','2222::-2223::'],
+ ['0a00:0080/25', '2220::/13,3330::/13','1111:1111::/32',
+ '2222::-2223::'],
'1-16,40,33,22,60-156',
'ss.cer',
- 'm:roa-pki://home/testdir,
r:rsync://my/new/home/dir/for/ca/stuff')
+ 'm:roa-pki://home/testdir,' \
+ + ' r:rsync://my/new/home/dir/for/ca/stuff')
ee = EE_cert(56,
['name','value'],
@@ -433,7 +457,8 @@ def main():
'1-16,40,33,22,60-156',
'ee.cer',
'/home/ksirois/rpki/trunk/testcases, /home/testdir/APNIC',
- 'm:roa-pki://home/testdir,
r:rsync://my/new/home/dir/for/ca/stuff')
+ 'm:roa-pki://home/testdir,' \
+ + ' r:rsync://my/new/home/dir/for/ca/stuff')
ca = CA_cert(234678,
['name','val'],
@@ -449,7 +474,8 @@ def main():
'1-16,40,33,22,60-156',
'ca.cer',
'crldp',
- 'm:roa-pki://home/testdir,
r:rsync://my/new/home/dir/for/ca/stuff','aia')
+ 'm:roa-pki://home/testdir,' \
+ + ' r:rsync://my/new/home/dir/for/ca/stuff','aia')
#Fire off the test
diff --git a/tests/test.include.in b/tests/test.include.in
index c006026..f8113f5 100644
--- a/tests/test.include.in
+++ b/tests/test.include.in
@@ -69,9 +69,17 @@ run_bg () {
case "$CHECKTOOL" in
"valgrind")
if test "x$STRICT_CHECKS" = x1; then
- valgrind
--log-file="$log_dir/valgrind.$TEST_LOG_NAME.$LOG.log" --track-fds=yes
--leak-check=full --error-exitcode=1 "$PROG" "$@" <&0 &
+ valgrind \
+ --log-file="$log_dir/valgrind.$TEST_LOG_NAME.$LOG.log" \
+ --track-fds=yes \
+ --leak-check=full \
+ --error-exitcode=1 \
+ "$PROG" "$@" <&0 &
else
- valgrind
--log-file="$log_dir/valgrind.$TEST_LOG_NAME.$LOG.log" --error-exitcode=1
"$PROG" "$@" <&0 &
+ valgrind \
+ --log-file="$log_dir/valgrind.$TEST_LOG_NAME.$LOG.log" \
+ --error-exitcode=1 \
+ "$PROG" "$@" <&0 &
fi
;;
"" | "none")
--
2.4.5
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
rpstir-devel mailing list
rpstir-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpstir-devel
