diff options
| author | Rob Austein <sra@hactrn.net> | 2009-07-05 02:17:36 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-07-05 02:17:36 +0000 |
| commit | 30e2484bc686bd32d197df1fcae07b5e1a85cd7d (patch) | |
| tree | 7a35663dc5d0ef6b5f77597b7fdf930d49776aaa /myrpki | |
| parent | 90a2370c7c977c607ff2f0d50ccb12b1012f0360 (diff) | |
Checkpoint
svn path=/myrpki/myirbe.py; revision=2575
Diffstat (limited to 'myrpki')
| -rw-r--r-- | myrpki/myirbe.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/myrpki/myirbe.py b/myrpki/myirbe.py index a2837741..d56f172f 100644 --- a/myrpki/myirbe.py +++ b/myrpki/myirbe.py @@ -185,7 +185,7 @@ if hosted_cacert: call_rpkid = rpki.async.sync_wrapper(caller( proto = rpki.left_right, - client_key = rpki.x509.RSA(PEM_file = bpki_rpkid.dir + "/irbe_cli.key"), + client_key = rpki.x509.RSA( PEM_file = bpki_rpkid.dir + "/irbe_cli.key"), client_cert = rpki.x509.X509(PEM_file = bpki_rpkid.dir + "/irbe_cli.cer"), server_ta = rpki.x509.X509(PEM_file = bpki_rpkid.cer), server_cert = rpki.x509.X509(PEM_file = bpki_rpkid.dir + "/rpkid.cer"), @@ -193,25 +193,21 @@ call_rpkid = rpki.async.sync_wrapper(caller( call_pubd = rpki.async.sync_wrapper(caller( proto = rpki.publication, - client_key = rpki.x509.RSA(PEM_file = bpki_pubd.dir + "/irbe_cli.key"), + client_key = rpki.x509.RSA( PEM_file = bpki_pubd.dir + "/irbe_cli.key"), client_cert = rpki.x509.X509(PEM_file = bpki_pubd.dir + "/irbe_cli.cer"), server_ta = rpki.x509.X509(PEM_file = bpki_pubd.cer), server_cert = rpki.x509.X509(PEM_file = bpki_pubd.dir + "/pubd.cer"), url = "https://localhost:4402/control")) -rpkid_pdus = [ +call_rpkid(( rpki.left_right.self_elt.make_pdu( action = "get", tag = "self", self_handle = my_handle), rpki.left_right.bsc_elt.make_pdu( action = "list", tag = "bsc", self_handle = my_handle), rpki.left_right.parent_elt.make_pdu( action = "list", tag = "parent", self_handle = my_handle), rpki.left_right.child_elt.make_pdu( action = "list", tag = "child", self_handle = my_handle), - rpki.left_right.repository_elt.make_pdu(action = "list", tag = "repository", self_handle = my_handle) ] + rpki.left_right.repository_elt.make_pdu(action = "list", tag = "repository", self_handle = my_handle))) -pubd_pdus = [ - rpki.publication.client_elt.make_pdu( action = "get", tag = "client", client_handle = my_handle) ] - -call_rpkid(rpkid_pdus) - -call_pubd(pubd_pdus) +call_pubd(( + rpki.publication.client_elt.make_pdu(action = "get", tag = "client", client_handle = my_handle),)) def showcerts(): |