diff options
Diffstat (limited to 'usr/src/cmd/ssh/include')
| -rw-r--r-- | usr/src/cmd/ssh/include/key.h | 15 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/include/servconf.h | 1 |
2 files changed, 12 insertions, 4 deletions
diff --git a/usr/src/cmd/ssh/include/key.h b/usr/src/cmd/ssh/include/key.h index 862b2d81d4..ec4993a9c1 100644 --- a/usr/src/cmd/ssh/include/key.h +++ b/usr/src/cmd/ssh/include/key.h @@ -39,11 +39,17 @@ extern "C" { typedef struct Key Key; enum types { - KEY_RSA1, - KEY_RSA, - KEY_DSA, + KEY_RSA1, + KEY_RSA, + KEY_DSA, + KEY_ECDSA, + KEY_RSA_CERT, + KEY_DSA_CERT, + KEY_ECDSA_CERT, + KEY_RSA_CERT_V00, + KEY_DSA_CERT_V00, KEY_NULL, - KEY_UNSPEC + KEY_UNSPEC }; enum fp_type { SSH_FP_SHA1, @@ -87,6 +93,7 @@ int key_names_valid2(const char *); int key_sign(Key *, u_char **, u_int *, u_char *, u_int); int key_verify(Key *, u_char *, u_int, u_char *, u_int); +int key_type_plain(int type); #ifdef __cplusplus } #endif diff --git a/usr/src/cmd/ssh/include/servconf.h b/usr/src/cmd/ssh/include/servconf.h index a66c6415cb..9a32544c2a 100644 --- a/usr/src/cmd/ssh/include/servconf.h +++ b/usr/src/cmd/ssh/include/servconf.h @@ -167,6 +167,7 @@ typedef struct { char *pre_userauth_hook; char *pam_service_prefix; char *pam_service_name; + char *pubkey_plugin; } ServerOptions; |