diff options
| author | Rob Austein <sra@hactrn.net> | 2010-10-07 00:59:39 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-10-07 00:59:39 +0000 |
| commit | 94bad6e5ca0045bb46093a3002e7c03ea6e0bee4 (patch) | |
| tree | b54b80610b8565a232167290010172cac6b0df2b /rpkid/tests/xml-parse-test.py | |
| parent | 8ada594d05c4e79fc2e3a13b50489bb75bd90cae (diff) | |
Merge rpkid.without_tls/ branch to rpkid/ trunk.
svn path=/rpkid/Makefile; revision=3465
Diffstat (limited to 'rpkid/tests/xml-parse-test.py')
| -rw-r--r-- | rpkid/tests/xml-parse-test.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/rpkid/tests/xml-parse-test.py b/rpkid/tests/xml-parse-test.py index 48154a79..e06ac29f 100644 --- a/rpkid/tests/xml-parse-test.py +++ b/rpkid/tests/xml-parse-test.py @@ -1,7 +1,21 @@ """ $Id$ -Copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +Copyright (C) 2010 Internet Systems Consortium ("ISC") + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -68,9 +82,7 @@ def lr_tester(elt_in, elt_out, msg): # (obj.pkcs10_request, "PKCS #10 request") if isinstance(obj, rpki.left_right.parent_elt): pprint(((obj.bpki_cms_cert, "CMS certificate"), - (obj.bpki_cms_glue, "CMS glue"), - (obj.bpki_https_cert, "HTTPS certificate"), - (obj.bpki_https_glue, "HTTPS glue"))) + (obj.bpki_cms_glue, "CMS glue"))) if isinstance(obj, (rpki.left_right.child_elt, rpki.left_right.repository_elt)): pprint(((obj.bpki_cert, "Certificate"), (obj.bpki_glue, "Glue"))) |