diff options
| author | Rob Austein <sra@hactrn.net> | 2010-03-10 02:41:19 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-03-10 02:41:19 +0000 |
| commit | 99362cbb050fb8264e8b7f8245814bce8ac82de1 (patch) | |
| tree | aea176b88112b81bf143a11882a0f3be39f9e76f | |
| parent | 5b38c36dc2ea5d2c6a6cd36966b9f96582814313 (diff) | |
Cleanup
svn path=/myrpki.rototill/myrpki.py; revision=3059
| -rw-r--r-- | myrpki.rototill/myrpki.py | 2 | ||||
| -rwxr-xr-x | myrpki.rototill/verify-bpki.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py index 1d0f470e..c9bf600c 100644 --- a/myrpki.rototill/myrpki.py +++ b/myrpki.rototill/myrpki.py @@ -692,7 +692,7 @@ class CA(object): return self.xcert(fn, path_restriction) finally: if not filename and os.path.exists(fn): - #os.unlink(fn) + os.unlink(fn) pass def xcert(self, cert, path_restriction = 0): diff --git a/myrpki.rototill/verify-bpki.sh b/myrpki.rototill/verify-bpki.sh index e7915602..0e36d796 100755 --- a/myrpki.rototill/verify-bpki.sh +++ b/myrpki.rototill/verify-bpki.sh @@ -1,7 +1,7 @@ #!/bin/sh - # $Id$ # -# Copyright (C) 2009 Internet Systems Consortium ("ISC") +# Copyright (C) 2009-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 @@ -37,7 +37,7 @@ do done # Check that cross-certified BSC certificates verify properly -if test -d bpki/myirbe +if test -d bpki/servers then - cat bpki/myirbe/xcert.*.cer | openssl verify -verbose -CAfile bpki/myirbe/ca.cer -untrusted /dev/stdin bpki/myrpki/bsc.*.cer + cat bpki/servers/xcert.*.cer | openssl verify -verbose -CAfile bpki/servers/ca.cer -untrusted /dev/stdin bpki/resources/bsc.*.cer fi |