Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matt Johnston
dropbear
Commits
6b5317e7
Commit
6b5317e7
authored
Jun 25, 2014
by
Matt Johnston
Browse files
Fix compiling with ECDSA and DSS disabled
parent
2a1d28ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
keyimport.c
View file @
6b5317e7
...
...
@@ -602,13 +602,18 @@ static sign_key *openssh_read(const char *filename, char * UNUSED(passphrase))
*/
blobbuf
=
buf_new
(
3000
);
#ifdef DROPBEAR_DSS
if
(
key
->
type
==
OSSH_DSA
)
{
buf_putstring
(
blobbuf
,
"ssh-dss"
,
7
);
retkey
->
type
=
DROPBEAR_SIGNKEY_DSS
;
}
else
if
(
key
->
type
==
OSSH_RSA
)
{
}
#endif
#ifdef DROPBEAR_RSA
if
(
key
->
type
==
OSSH_RSA
)
{
buf_putstring
(
blobbuf
,
"ssh-rsa"
,
7
);
retkey
->
type
=
DROPBEAR_SIGNKEY_RSA
;
}
#endif
for
(
i
=
0
;
i
<
num_integers
;
i
++
)
{
ret
=
ber_read_id_len
(
p
,
key
->
keyblob
+
key
->
keyblob_len
-
p
,
...
...
@@ -831,7 +836,14 @@ static int openssh_write(const char *filename, sign_key *key,
mp_int
dmp1
,
dmq1
,
iqmp
,
tmpval
;
/* for rsa */
#endif
if
(
key
->
type
==
DROPBEAR_SIGNKEY_RSA
||
key
->
type
==
DROPBEAR_SIGNKEY_DSS
)
if
(
#ifdef DROPBEAR_RSA
key
->
type
==
DROPBEAR_SIGNKEY_RSA
||
#endif
#ifdef DROPBEAR_DSS
key
->
type
==
DROPBEAR_SIGNKEY_DSS
||
#endif
0
)
{
/*
* Fetch the key blobs.
...
...
signkey.c
View file @
6b5317e7
...
...
@@ -106,6 +106,7 @@ enum signkey_type signkey_type_from_name(const char* name, unsigned int namelen)
void
**
signkey_key_ptr
(
sign_key
*
key
,
enum
signkey_type
type
)
{
switch
(
type
)
{
#ifdef DROPBEAR_ECDSA
#ifdef DROPBEAR_ECC_256
case
DROPBEAR_SIGNKEY_ECDSA_NISTP256
:
return
(
void
**
)
&
key
->
ecckey256
;
...
...
@@ -118,6 +119,7 @@ signkey_key_ptr(sign_key *key, enum signkey_type type) {
case
DROPBEAR_SIGNKEY_ECDSA_NISTP521
:
return
(
void
**
)
&
key
->
ecckey521
;
#endif
#endif
/* DROPBEAR_ECDSA */
#ifdef DROPBEAR_RSA
case
DROPBEAR_SIGNKEY_RSA
:
return
(
void
**
)
&
key
->
rsakey
;
...
...
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