diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2018-02-27 14:50:00 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-02-27 16:34:35 -0500 |
| commit | 79f1e6171ed6b3c6acb6305e507cc77ac9511669 (patch) | |
| tree | 745c5939a4ed59bf460bf0421f45da9773b388e2 /usr/src | |
| parent | 0b794c39383bdb712a9092aa6a044e71a7aa5c90 (diff) | |
| download | illumos-gate-79f1e6171ed6b3c6acb6305e507cc77ac9511669.tar.gz | |
9200 tpmadm says "restart Solaris"
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Michal Nowak <mnowak@startmail.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cmd-crypto/tpmadm/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/cmd/cmd-crypto/tpmadm/main.c b/usr/src/cmd/cmd-crypto/tpmadm/main.c index 1cdc02b14d..a203527b54 100644 --- a/usr/src/cmd/cmd-crypto/tpmadm/main.c +++ b/usr/src/cmd/cmd-crypto/tpmadm/main.c @@ -22,6 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright 2018 OmniOS Community Edition (OmniOSce) Association. */ @@ -135,7 +136,7 @@ print_error(TSS_RESULT ret, char *msg) case TPM_E_DEACTIVATED: case TPM_E_DISABLED: (void) fprintf(stderr, - gettext("Enable the TPM and restart Solaris.\n")); + gettext("Enable the TPM and reboot.\n")); break; case TSP_ERROR(TSS_E_COMM_FAILURE): (void) fprintf(stderr, @@ -147,7 +148,7 @@ print_error(TSS_RESULT ret, char *msg) int get_tpm_capability(TSS_HCONTEXT hContext, TSS_HOBJECT hTPM, UINT32 cap, -UINT32 subcap, void *buf, size_t bufsize) + UINT32 subcap, void *buf, size_t bufsize) { TSS_RESULT ret; UINT32 datalen; @@ -179,7 +180,7 @@ UINT32 subcap, void *buf, size_t bufsize) int set_policy_options(TSS_HPOLICY hPolicy, TSS_FLAG mode, char *prompt, -UINT32 secret_len, BYTE *secret) + UINT32 secret_len, BYTE *secret) { TSS_RESULT ret; BYTE *unicode_prompt; @@ -206,7 +207,7 @@ UINT32 secret_len, BYTE *secret) int set_object_policy(TSS_HOBJECT handle, TSS_FLAG mode, char *prompt, -UINT32 secret_len, BYTE *secret) + UINT32 secret_len, BYTE *secret) { TSS_HPOLICY hPolicy; TSS_RESULT ret; |