pki: Add support to encode public keys in SSH key format

diff --git a/configure.ac b/configure.ac
index 6af8b535d3f1fb9938eaf0cb528c7c1e73a436f7..3dbeeccee03ab3c3a7d535c4d42c4cca8b996663 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1009,7 +1009,7 @@ ADD_PLUGIN([pkcs8],                [s charon openac scepclient pki scripts manag
 ADD_PLUGIN([pkcs12],               [s charon scepclient pki scripts cmd])
 ADD_PLUGIN([pgp],                  [s charon])
 ADD_PLUGIN([dnskey],               [s charon pki])
-ADD_PLUGIN([sshkey],               [s charon nm cmd])
+ADD_PLUGIN([sshkey],               [s charon pki nm cmd])
 ADD_PLUGIN([ipseckey],             [c charon])
 ADD_PLUGIN([pem],                  [s charon openac scepclient pki scripts manager medsrv attest nm cmd])
 ADD_PLUGIN([padlock],              [s charon])

diff --git a/src/pki/commands/pub.c b/src/pki/commands/pub.c
index 5a658afecbe51733b962f664f1ffe587408d472a..d85ee9ff3e2caf6f9a86e4e20df528c1dfb41c76 100644 (file)
--- a/src/pki/commands/pub.c
+++ b/src/pki/commands/pub.c
@@ -158,7 +158,7 @@ static void __attribute__ ((constructor))reg()
                pub, 'p', "pub",
                "extract the public key from a private key/certificate",
                {"[--in file|--keyid hex] [--type rsa|ecdsa|pkcs10|x509]",
-                "[--outform der|pem|dnskey]"},
+                "[--outform der|pem|dnskey|sshkey]"},
                {
                        {"help",        'h', 0, "show usage information"},
                        {"in",          'i', 1, "input file, default: stdin"},

diff --git a/src/pki/man/pki---pub.1.in b/src/pki/man/pki---pub.1.in
index d588ae73284a530e031f1c6d9a51a4d336c801b9..a1b9b0ad41cb9c2c10e06e9c2801e41729e19fb4 100644 (file)
--- a/src/pki/man/pki---pub.1.in
+++ b/src/pki/man/pki---pub.1.in
@@ -53,7 +53,8 @@ certificate), defaults to \fIrsa\fR.
 .TP
 .BI "\-f, \-\-outform " encoding
 Encoding of the extracted public key. One of \fIder\fR (ASN.1 DER), \fIpem\fR
-(Base64 PEM), or \fIdnskey\fR (RFC 3110 DNS key), defaults to \fIder\fR.
+(Base64 PEM), \fIdnskey\fR (RFC 3110 DNS key), or \fIsshkey\fR (RFC 4253 SSH
+key), defaults to \fIder\fR.
 .
 .SH "EXAMPLES"
 .
@@ -72,4 +73,4 @@ Extract the public key from an X.509 certificate:
 .
 .SH "SEE ALSO"
 .
-.BR pki (1)
\ No newline at end of file
+.BR pki (1)

diff --git a/src/pki/pki.c b/src/pki/pki.c
index c3039a649139a3aa05b051fa7c72b6e53d588fb1..ecc0702cdf77bd3e650f7a760f96e1a7b13a6cda 100644 (file)
--- a/src/pki/pki.c
+++ b/src/pki/pki.c
@@ -81,7 +81,18 @@ bool get_form(char *form, cred_encoding_type_t *enc, credential_type_t type)
                switch (type)
                {
                        case CRED_PUBLIC_KEY:
-                               *enc =PUBKEY_DNSKEY;
+                               *enc = PUBKEY_DNSKEY;
+                               return TRUE;
+                       default:
+                               return FALSE;
+               }
+       }
+       else if (streq(form, "sshkey"))
+       {
+               switch (type)
+               {
+                       case CRED_PUBLIC_KEY:
+                               *enc = PUBKEY_SSHKEY;
                                return TRUE;
                        default:
                                return FALSE;