diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c | 18 | ||||
| -rw-r--r-- | usr/src/lib/libipsecutil/common/ikedoor.h | 6 |
2 files changed, 20 insertions, 4 deletions
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c index 3ecb497ad9..4f3524ade6 100644 --- a/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c +++ b/usr/src/cmd/cmd-inet/usr.sbin/ipsecutils/ikeadm.c @@ -1355,17 +1355,27 @@ dhstr(int grp) switch (grp) { case 0: - return (gettext("<unknown>")); + return (gettext("<unavailable>")); case IKE_GRP_DESC_MODP_768: - return (gettext("768-bit MODP")); + return (gettext("768-bit MODP (group 1)")); case IKE_GRP_DESC_MODP_1024: - return (gettext("1024-bit MODP")); + return (gettext("1024-bit MODP (group 2)")); case IKE_GRP_DESC_EC2N_155: return (gettext("EC2N group on GP[2^155]")); case IKE_GRP_DESC_EC2N_185: return (gettext("EC2N group on GP[2^185]")); case IKE_GRP_DESC_MODP_1536: - return (gettext("1536-bit MODP")); + return (gettext("1536-bit MODP (group 5)")); + case IKE_GRP_DESC_MODP_2048: + return (gettext("2048-bit MODP (group 14)")); + case IKE_GRP_DESC_MODP_3072: + return (gettext("3072-bit MODP (group 15)")); + case IKE_GRP_DESC_MODP_4096: + return (gettext("4096-bit MODP (group 16)")); + case IKE_GRP_DESC_MODP_6144: + return (gettext("6144-bit MODP (group 17)")); + case IKE_GRP_DESC_MODP_8192: + return (gettext("8192-bit MODP (group 18)")); default: (void) snprintf(rtn, MAXLINESIZE, gettext("<unknown %d>"), grp); return (rtn); diff --git a/usr/src/lib/libipsecutil/common/ikedoor.h b/usr/src/lib/libipsecutil/common/ikedoor.h index c9c12b1104..d32ec751c5 100644 --- a/usr/src/lib/libipsecutil/common/ikedoor.h +++ b/usr/src/lib/libipsecutil/common/ikedoor.h @@ -234,7 +234,13 @@ typedef struct { #define IKE_GRP_DESC_MODP_1024 2 #define IKE_GRP_DESC_EC2N_155 3 #define IKE_GRP_DESC_EC2N_185 4 +/* values for p1xf_dh_group (aligned with RFC3526) */ #define IKE_GRP_DESC_MODP_1536 5 +#define IKE_GRP_DESC_MODP_2048 14 +#define IKE_GRP_DESC_MODP_3072 15 +#define IKE_GRP_DESC_MODP_4096 16 +#define IKE_GRP_DESC_MODP_6144 17 +#define IKE_GRP_DESC_MODP_8192 18 /* values for p1xf_auth_meth (aligned with RFC2409, Appendix A) */ #define IKE_AUTH_METH_PRE_SHARED_KEY 1 |