|
@ -1141,13 +1141,19 @@ _createkey() { |
|
|
|
|
|
|
|
|
_debug "Use length $length" |
|
|
_debug "Use length $length" |
|
|
|
|
|
|
|
|
if ! touch "$f" >/dev/null 2>&1; then |
|
|
|
|
|
_f_path="$(dirname "$f")" |
|
|
|
|
|
_debug _f_path "$_f_path" |
|
|
|
|
|
if ! mkdir -p "$_f_path"; then |
|
|
|
|
|
_err "Can not create path: $_f_path" |
|
|
|
|
|
|
|
|
if ! [ -e "$f" ]; then |
|
|
|
|
|
if ! touch "$f" >/dev/null 2>&1; then |
|
|
|
|
|
_f_path="$(dirname "$f")" |
|
|
|
|
|
_debug _f_path "$_f_path" |
|
|
|
|
|
if ! mkdir -p "$_f_path"; then |
|
|
|
|
|
_err "Can not create path: $_f_path" |
|
|
|
|
|
return 1 |
|
|
|
|
|
fi |
|
|
|
|
|
fi |
|
|
|
|
|
if ! touch "$f" >/dev/null 2>&1; then |
|
|
return 1 |
|
|
return 1 |
|
|
fi |
|
|
fi |
|
|
|
|
|
chmod 600 "$f" |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
if _isEccKey "$length"; then |
|
|
if _isEccKey "$length"; then |
|
@ -1495,7 +1501,6 @@ _create_account_key() { |
|
|
else |
|
|
else |
|
|
#generate account key |
|
|
#generate account key |
|
|
if _createkey "$length" "$ACCOUNT_KEY_PATH"; then |
|
|
if _createkey "$length" "$ACCOUNT_KEY_PATH"; then |
|
|
chmod 600 "$ACCOUNT_KEY_PATH" |
|
|
|
|
|
_info "Create account key ok." |
|
|
_info "Create account key ok." |
|
|
return 0 |
|
|
return 0 |
|
|
else |
|
|
else |
|
@ -5611,8 +5616,9 @@ _installcert() { |
|
|
if [ -f "$_real_key" ]; then |
|
|
if [ -f "$_real_key" ]; then |
|
|
cat "$CERT_KEY_PATH" >"$_real_key" || return 1 |
|
|
cat "$CERT_KEY_PATH" >"$_real_key" || return 1 |
|
|
else |
|
|
else |
|
|
cat "$CERT_KEY_PATH" >"$_real_key" || return 1 |
|
|
|
|
|
|
|
|
touch "$_real_key" || return 1 |
|
|
chmod 600 "$_real_key" |
|
|
chmod 600 "$_real_key" |
|
|
|
|
|
cat "$CERT_KEY_PATH" >"$_real_key" || return 1 |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|