Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
9a89b62a
Commit
9a89b62a
authored
Jul 07, 2015
by
Leigh B Stoller
Browse files
Minor change to previous revision; delimit private key.
parent
d53a7dfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
apt/create_instance.in
View file @
9a89b62a
...
...
@@ -693,7 +693,7 @@ my $blob = {'uuid' => $quickvm_uuid,
'
servername
'
=>
$SERVER_NAME
,
'
rspec
'
=>
$rspecstr
,
'
cert
'
=>
$alt_certificate
->
cert
(),
'
privkey
'
=>
$alt_certificate
->
p
riv
k
ey
(),
'
privkey
'
=>
$alt_certificate
->
P
riv
K
ey
Delimited
(),
};
if
(
defined
(
$project
))
{
$blob
->
{"
pid
"}
=
$project
->
pid
();
...
...
@@ -1066,7 +1066,8 @@ sub CreateSliver($)
@dataset_credentials
],
"
certificate
"
=>
$alt_certificate
->
cert
(),
"
key
"
=>
$alt_certificate
->
privkey
(),
"
key
"
=>
$alt_certificate
->
PrivKeyDelimited
(),
});
if
(
!
defined
(
$response
)
||
$response
->
code
()
!=
GENIRESPONSE_SUCCESS
)
{
...
...
@@ -1357,7 +1358,7 @@ sub RunStitcher()
print "Provisioning at
$urn
\n
";
if (
$aggobj
->Provision(
\
$errmsg
,
\
@sshkeys
,
$alt_certificate
->cert(),
$alt_certificate
->
p
riv
k
ey())) {
$alt_certificate
->
P
riv
K
ey
Delimited
())) {
$aggobj
->SetStatus("failed");
$webtask
->output(
$errmsg
);
$webtask
->Exited(-1);
...
...
protogeni/lib/GeniCertificate.pm.in
View file @
9a89b62a
...
...
@@ -1043,6 +1043,17 @@ sub WriteKeyToFile($)
return
$
filename
;
}
#
Hmm
,
how
did
we
get
into
this
odd
state
?
sub
PrivKeyDelimited
($)
{
my
($
self
)
=
@
_
;
return
"-----BEGIN RSA PRIVATE KEY-----
\n
"
.
$
self
->
privkey
()
.
"-----END RSA PRIVATE KEY-----
\n
"
;
}
#
#
Find
the
root
certificate
for
a
single
certificate
.
Optional
set
of
#
chain
certs
provided
.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment