projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-lib: Try to call exit before killing.
[cascardo/ovs.git]
/
utilities
/
ovs-pki.in
diff --git
a/utilities/ovs-pki.in
b/utilities/ovs-pki.in
index
89af405
..
a96ada3
100755
(executable)
--- a/
utilities/ovs-pki.in
+++ b/
utilities/ovs-pki.in
@@
-1,6
+1,6
@@
#! /bin/sh
#! /bin/sh
-# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013
, 2014
Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-195,7
+195,7
@@
if test -z "$dsaparam"; then
dsaparam=$pkidir/dsaparam.pem
fi
case $log in
dsaparam=$pkidir/dsaparam.pem
fi
case $log in
- /*) ;;
+ /*
| ?:[\\/]*
) ;;
*) log=`pwd`/$log ;;
esac
*) log=`pwd`/$log ;;
esac
@@
-274,7
+274,7
@@
private_key = $dir/private/cakey.pem# CA private key
RANDFILE = $dir/private/.rand # random number file
default_days = 3650 # how long to certify for
default_crl_days= 30 # how long before next CRL
RANDFILE = $dir/private/.rand # random number file
default_days = 3650 # how long to certify for
default_crl_days= 30 # how long before next CRL
-default_md =
md5 # md
to use
+default_md =
sha1 # message digest
to use
policy = policy # default policy
email_in_dn = no # Don't add the email into cert DN
name_opt = ca_default # Subject name display option
policy = policy # default policy
email_in_dn = no # Don't add the email into cert DN
name_opt = ca_default # Subject name display option
@@
-461,9
+461,18
@@
sign_request() {
must_not_exist "$2"
pkidir_must_exist
must_not_exist "$2"
pkidir_must_exist
+ case "$1" in
+ /* | ?:[\\/]*)
+ request_file="$1"
+ ;;
+ *)
+ request_file="`pwd`/$1"
+ ;;
+ esac
+
(cd "$pkidir/${type}ca" &&
(cd "$pkidir/${type}ca" &&
- openssl ca -config ca.cnf -batch -in
/dev/stdin
) \
-
< "$1"
> "$2.tmp$$" 2>&3
+ openssl ca -config ca.cnf -batch -in
"$request_file"
) \
+ > "$2.tmp$$" 2>&3
mv "$2.tmp$$" "$2"
}
mv "$2.tmp$$" "$2"
}