summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c10
-rw-r--r--usr/src/cmd/cmd-crypto/cryptoadm/adm_kef_util.c13
-rw-r--r--usr/src/cmd/cmd-crypto/cryptoadm/adm_metaslot.c4
-rw-r--r--usr/src/cmd/cmd-crypto/cryptoadm/adm_uef.c8
-rw-r--r--usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.c55
5 files changed, 42 insertions, 48 deletions
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c b/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c
index 51d9519367..b38636c802 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef.c
@@ -19,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -214,7 +212,7 @@ list_policy_for_hard(char *provname)
"%s: all mechanisms are enabled."), provname);
if (has_random)
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "random" is a keyword and not to be
* translated.
*/
@@ -387,7 +385,7 @@ disable_kef_software(char *provname, boolean_t rndflag, boolean_t allflag,
return (FAILURE);
} else if (is_active == B_FALSE) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "disable" is a keyword and not to be translated.
*/
cryptoerror(LOG_STDERR,
@@ -1323,7 +1321,7 @@ unload_kef_soft(char *provname, boolean_t do_check)
cryptodebug("CRYPTO_UNLOAD_SOFT_MODULE ioctl return_value = "
"%d", punload_soft->sm_return_value);
/*
- * If the return value is CRYPTO_UNKNOWN_PRIVDER, it means
+ * If the return value is CRYPTO_UNKNOWN_PROVIDER, it means
* that the provider is not registered yet. Should just
* continue.
*/
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef_util.c b/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef_util.c
index 311d11ba81..0156d3a2e6 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef_util.c
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/adm_kef_util.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
@@ -1193,7 +1190,7 @@ print_kef_policy(entry_t *pent, boolean_t has_random, boolean_t has_mechs)
if (has_mechs == B_TRUE) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* This code block may need to be modified a bit to avoid
* constructing the text message on the fly.
*/
@@ -1211,7 +1208,7 @@ print_kef_policy(entry_t *pent, boolean_t has_random, boolean_t has_mechs)
}
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "random" is a keyword and not to be translated.
*/
if (rnd_disabled)
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/adm_metaslot.c b/usr/src/cmd/cmd-crypto/cryptoadm/adm_metaslot.c
index 00ae276dc2..6f569c90e2 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/adm_metaslot.c
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/adm_metaslot.c
@@ -84,7 +84,7 @@ list_metaslot_info(boolean_t show_mechs, boolean_t verbose,
(void) printf(gettext("System-wide Meta Slot Configuration:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -113,7 +113,7 @@ list_metaslot_info(boolean_t show_mechs, boolean_t verbose,
if (verbose) {
(void) printf(gettext("\nDetailed Meta Slot Information:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as
* long as the length of the translated text above.
*/
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/adm_uef.c b/usr/src/cmd/cmd-crypto/cryptoadm/adm_uef.c
index f240d36833..85944a381e 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/adm_uef.c
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/adm_uef.c
@@ -313,7 +313,7 @@ list_mechlist_for_lib(char *libname, mechlist_t *mlist,
for (i = 0; i < slot_count; i++) {
if (verbose)
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* In some languages, the # symbol should be
* converted to "no", an "n" followed by a
* superscript "o"..
@@ -1223,14 +1223,14 @@ print_uef_policy(uentry_t *puent)
if (puent->flag_norandom == B_TRUE)
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "random" is a keyword and not to be translated.
*/
(void) printf(gettext(" %s is disabled."), "random");
else {
if (rng_flag == HAS_RNG)
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "random" is a keyword and not to be translated.
*/
(void) printf(gettext(" %s is enabled."), "random");
@@ -1810,7 +1810,7 @@ display_verbose_mech_header()
(void) printf("%28s %s", " ", HDR6);
(void) printf("%-28.28s %s", gettext("mechanism name"), HDR7);
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, the first header line should be
* as long as the length of the translated text above. The format
* lengths should all match too.
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.c b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.c
index de695026d6..4ce7598cd3 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.c
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.c
@@ -19,11 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
#include <fcntl.h>
#include <stdio.h>
@@ -54,7 +53,7 @@ enum subcommand_index {
CRYPTO_HELP };
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Command keywords are not to be translated.
*/
static char *cmd_table[] = {
@@ -83,7 +82,7 @@ typedef struct {
} cryptoadm_provider_t;
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Operand keywords are not to be translated.
*/
static const char *KN_PROVIDER = "provider=";
@@ -198,7 +197,7 @@ static void
usage(void)
{
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Command usage is not to be translated. Only the word "Usage:"
* along with localized expressions indicating what kind of value
* is expected for arguments.
@@ -252,7 +251,7 @@ usage(void)
* - PROV_KEF_SOFT if provname is a base name only
* - PROV_KEF_HARD if provname contains one slash only and the slash is not
* the 1st character.
- * - PROV_BADNAME othewise.
+ * - PROV_BADNAME otherwise.
*/
static int
get_provider_type(char *provname)
@@ -305,7 +304,7 @@ get_provider(int argc, char **argv)
if ((provstr = strdup(argv[c])) == NULL) {
int err = errno;
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "get_provider" is a function name and should
* not be translated.
*/
@@ -483,7 +482,7 @@ process_mech_operands(int argc, char **argv, boolean_t quiet)
if (!found) {
if (!quiet)
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "mechanism" could be either a literal keyword
* and hence not to be translated, or a descriptive
* word and translatable. A choice was made to
@@ -663,7 +662,7 @@ do_list(int argc, char **argv)
prov->cp_name);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "global" is keyword and not to
* be translated.
*/
@@ -680,7 +679,7 @@ do_list(int argc, char **argv)
prov->cp_name);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "global" is keyword and not to
* be translated.
*/
@@ -778,7 +777,7 @@ do_disable(int argc, char **argv)
allflag, mecharglist);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "disable" could be either a literal keyword
* and hence not to be translated, or a verb and
* translatable. A choice was made to view it as
@@ -803,7 +802,7 @@ do_disable(int argc, char **argv)
allflag, mecharglist);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "disable" could be either a literal keyword
* and hence not to be translated, or a verb and
* translatable. A choice was made to view it as
@@ -911,7 +910,7 @@ do_enable(int argc, char **argv)
mecharglist);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "enable" could be either a literal keyword
* and hence not to be translated, or a verb and
* translatable. A choice was made to view it as
@@ -962,7 +961,7 @@ do_install(int argc, char **argv)
if (prov == NULL ||
prov->cp_type == PROV_BADNAME || prov->cp_type == PROV_KEF_HARD) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "install" could be either a literal keyword and hence
* not to be translated, or a verb and translatable. A
* choice was made to view it as a literal keyword.
@@ -983,7 +982,7 @@ do_install(int argc, char **argv)
/* check if there are mechanism operands */
if (argc < 4) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "mechanism" could be either a literal keyword and hence
* not to be translated, or a descriptive word and
* translatable. A choice was made to view it as a literal
@@ -1002,7 +1001,7 @@ do_install(int argc, char **argv)
if (allflag == B_TRUE) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "all", "mechanism", and "install" are all keywords and
* not to be translated.
*/
@@ -1017,7 +1016,7 @@ do_install(int argc, char **argv)
rc = install_kef(prov->cp_name, mecharglist);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "install" could be either a literal keyword and hence
* not to be translated, or a verb and translatable. A
* choice was made to view it as a literal keyword.
@@ -1052,7 +1051,7 @@ do_uninstall(int argc, char **argv)
if (prov == NULL ||
prov->cp_type == PROV_BADNAME || prov->cp_type == PROV_KEF_HARD) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "uninstall" could be either a literal keyword and hence
* not to be translated, or a verb and translatable. A
* choice was made to view it as a literal keyword.
@@ -1070,7 +1069,7 @@ do_uninstall(int argc, char **argv)
rc = uninstall_kef(prov->cp_name);
} else {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "uninstall" could be either a literal keyword and
* hence not to be translated, or a verb and
* translatable. A choice was made to view it as a
@@ -1122,7 +1121,7 @@ do_unload(int argc, char **argv)
if (getzoneid() != GLOBAL_ZONEID) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "unload" could be either a literal keyword and hence
* not to be translated, or a verb and translatable.
* A choice was made to view it as a literal keyword.
@@ -1382,7 +1381,7 @@ list_mechlist_for_all(boolean_t verbose)
/* get user-level providers */
(void) printf(gettext("\nUser-level providers:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -1412,7 +1411,7 @@ list_mechlist_for_all(boolean_t verbose)
/* get kernel software providers */
(void) printf(gettext("\nKernel software providers:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -1487,7 +1486,7 @@ list_mechlist_for_all(boolean_t verbose)
/* Get kernel hardware providers and their mechanism lists */
(void) printf(gettext("\nKernel hardware providers:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -1542,7 +1541,7 @@ list_policy_for_all(void)
/* Get user-level providers */
(void) printf(gettext("\nUser-level providers:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -1569,7 +1568,7 @@ list_policy_for_all(void)
/* kernel software providers */
(void) printf(gettext("\nKernel software providers:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -1600,7 +1599,7 @@ list_policy_for_all(void)
/* kcf.conf not there in non-global zone, no policy info */
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "global" is keyword and not to be translated.
*/
cryptoerror(LOG_STDERR, gettext(
@@ -1611,7 +1610,7 @@ list_policy_for_all(void)
/* Kernel hardware providers */
(void) printf(gettext("\nKernel hardware providers:\n"));
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* Strictly for appearance's sake, this line should be as long as
* the length of the translated text above.
*/
@@ -1619,7 +1618,7 @@ list_policy_for_all(void)
if (getzoneid() != GLOBAL_ZONEID) {
/*
- * TRANSLATION_NOTE:
+ * TRANSLATION_NOTE
* "global" is keyword and not to be translated.
*/
cryptoerror(LOG_STDERR, gettext(
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-27 06:00:06 +0000