diff options
Diffstat (limited to 'usr/src/uts/common')
37 files changed, 1 insertions, 889 deletions
diff --git a/usr/src/uts/common/Makefile b/usr/src/uts/common/Makefile deleted file mode 100644 index 7cf2f14f64..0000000000 --- a/usr/src/uts/common/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# 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. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# -# uts/common/Makefile -# -include $(SRC)/Makefile.master - -.KEEP_STATE: - -# EXPORT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) Makefile+ Makefile.rules+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile.rules > Makefile.rules+ - $(MV) Makefile.rules+ Makefile.rules - $(CHMOD) 444 Makefile Makefile.rules -# EXPORT DELETE END diff --git a/usr/src/uts/common/Makefile.files b/usr/src/uts/common/Makefile.files index d6f359e3f9..3a0654407b 100644 --- a/usr/src/uts/common/Makefile.files +++ b/usr/src/uts/common/Makefile.files @@ -1646,10 +1646,7 @@ K5_KRB= kfree.o copy_key.o \ K5_OS= timeofday.o toffset.o \ init_os_ctx.o c_ustime.o -SEAL= -# EXPORT DELETE START SEAL= seal.o unseal.o -# EXPORT DELETE END MECH= delete_sec_context.o \ import_sec_context.o \ diff --git a/usr/src/uts/common/crypto/io/Makefile b/usr/src/uts/common/crypto/io/Makefile deleted file mode 100644 index 7288a6a061..0000000000 --- a/usr/src/uts/common/crypto/io/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# ident "%Z%%M% %I% %E% SMI" -# -# Copyright 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# uts/common/crypto/io/Makefile -# -# include global definitions -include ../../../../Makefile.master - -.KEEP_STATE: - -# EXPORT DELETE START -EXPORT_SRC: - $(RM) Makefile+ aes.c+ arcfour.c+ blowfish.c+ dprov.c+ rsa.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < aes.c > aes.c+ - $(MV) aes.c+ aes.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < arcfour.c > arcfour.c+ - $(MV) arcfour.c+ arcfour.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < blowfish.c > blowfish.c+ - $(MV) blowfish.c+ blowfish.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < dprov.c > dprov.c+ - $(MV) dprov.c+ dprov.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < rsa.c > rsa.c+ - $(MV) rsa.c+ rsa.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(RM) Makefile - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile aes.c arcfour.c blowfish.c dprov.c rsa.c - -# EXPORT DELETE END diff --git a/usr/src/uts/common/crypto/io/aes.c b/usr/src/uts/common/crypto/io/aes.c index 626058cefa..4ce7e51380 100644 --- a/usr/src/uts/common/crypto/io/aes.c +++ b/usr/src/uts/common/crypto/io/aes.c @@ -306,8 +306,6 @@ aes_check_mech_param(crypto_mechanism_t *mechanism, aes_ctx_t **ctx, int kmflag) return (rv); } -/* EXPORT DELETE START */ - /* * Initialize key schedules for AES */ @@ -336,8 +334,6 @@ init_keysched(crypto_key_t *key, void *newbie) return (CRYPTO_SUCCESS); } -/* EXPORT DELETE END */ - /* * KCF software provider control entry points. */ @@ -372,9 +368,6 @@ aes_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, crypto_key_t *key, crypto_spi_ctx_template_t template, crypto_req_handle_t req, boolean_t is_encrypt_init) { - -/* EXPORT DELETE START */ - aes_ctx_t *aes_ctx; int rv; int kmflag; @@ -400,8 +393,6 @@ aes_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, ctx->cc_provider_private = aes_ctx; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -427,8 +418,6 @@ aes_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, { int ret = CRYPTO_FAILED; -/* EXPORT DELETE START */ - aes_ctx_t *aes_ctx; size_t saved_length, saved_offset, length_needed; @@ -534,8 +523,6 @@ aes_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, ASSERT(aes_ctx->ac_remainder_len == 0); (void) aes_free_context(ctx); -/* EXPORT DELETE END */ - return (ret); } @@ -546,8 +533,6 @@ aes_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, { int ret = CRYPTO_FAILED; -/* EXPORT DELETE START */ - aes_ctx_t *aes_ctx; off_t saved_offset; size_t saved_length, length_needed; @@ -652,8 +637,6 @@ aes_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, cleanup: (void) aes_free_context(ctx); -/* EXPORT DELETE END */ - return (ret); } @@ -825,9 +808,6 @@ static int aes_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - aes_ctx_t *aes_ctx; int ret; @@ -878,8 +858,6 @@ aes_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, (void) aes_free_context(ctx); -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -888,9 +866,6 @@ static int aes_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - aes_ctx_t *aes_ctx; int ret; off_t saved_offset; @@ -987,8 +962,6 @@ aes_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, (void) aes_free_context(ctx); -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -1294,9 +1267,6 @@ aes_create_ctx_template(crypto_provider_handle_t provider, crypto_mechanism_t *mechanism, crypto_key_t *key, crypto_spi_ctx_template_t *tmpl, size_t *tmpl_size, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - void *keysched; size_t size; int rv; @@ -1327,8 +1297,6 @@ aes_create_ctx_template(crypto_provider_handle_t provider, *tmpl = keysched; *tmpl_size = size; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -1336,9 +1304,6 @@ aes_create_ctx_template(crypto_provider_handle_t provider, static int aes_free_context(crypto_ctx_t *ctx) { - -/* EXPORT DELETE START */ - aes_ctx_t *aes_ctx = ctx->cc_provider_private; if (aes_ctx != NULL) { @@ -1352,8 +1317,6 @@ aes_free_context(crypto_ctx_t *ctx) ctx->cc_provider_private = NULL; } -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -1364,9 +1327,6 @@ aes_common_init_ctx(aes_ctx_t *aes_ctx, crypto_spi_ctx_template_t *template, boolean_t is_encrypt_init) { int rv = CRYPTO_SUCCESS; - -/* EXPORT DELETE START */ - void *keysched; size_t size; @@ -1444,8 +1404,6 @@ aes_common_init_ctx(aes_ctx_t *aes_ctx, crypto_spi_ctx_template_t *template, } } -/* EXPORT DELETE END */ - return (rv); } diff --git a/usr/src/uts/common/crypto/io/arcfour.c b/usr/src/uts/common/crypto/io/arcfour.c index fe6a64497d..81fe549684 100644 --- a/usr/src/uts/common/crypto/io/arcfour.c +++ b/usr/src/uts/common/crypto/io/arcfour.c @@ -201,9 +201,6 @@ rc4_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, crypto_key_t *key, crypto_spi_ctx_template_t template, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - ARCFour_key *keystream; if ((mechanism)->cm_type != RC4_MECH_INFO_TYPE) @@ -229,8 +226,6 @@ rc4_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, ctx->cc_provider_private = keystream; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -255,8 +250,6 @@ rc4_crypt_update(crypto_ctx_t *ctx, crypto_data_t *input, crypto_data_t *output, { int ret = CRYPTO_SUCCESS; -/* EXPORT DELETE START */ - ARCFour_key *key; off_t saveoffset; @@ -484,8 +477,6 @@ rc4_crypt_update(crypto_ctx_t *ctx, crypto_data_t *input, crypto_data_t *output, output->cd_offset = saveoffset; output->cd_length = input->cd_length; -/* EXPORT DELETE END */ - return (ret); } @@ -527,9 +518,6 @@ rc4_crypt_atomic(crypto_provider_handle_t handle, crypto_session_id_t session, static int rc4_free_context(crypto_ctx_t *ctx) { - -/* EXPORT DELETE START */ - ARCFour_key *keystream = ctx->cc_provider_private; if (keystream != NULL) { @@ -538,8 +526,6 @@ rc4_free_context(crypto_ctx_t *ctx) ctx->cc_provider_private = NULL; } -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } diff --git a/usr/src/uts/common/crypto/io/blowfish.c b/usr/src/uts/common/crypto/io/blowfish.c index f475f1e961..6c53ae2f13 100644 --- a/usr/src/uts/common/crypto/io/blowfish.c +++ b/usr/src/uts/common/crypto/io/blowfish.c @@ -240,7 +240,6 @@ _info(struct modinfo *modinfop) static int init_keysched(crypto_key_t *key, void *keysched) { -/* EXPORT DELETE START */ /* * Only keys by value are supported by this module. */ @@ -256,7 +255,6 @@ init_keysched(crypto_key_t *key, void *keysched) } blowfish_init_keysched(key->ck_data, key->ck_length, keysched); -/* EXPORT DELETE END */ return (CRYPTO_SUCCESS); } @@ -278,9 +276,6 @@ blowfish_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, crypto_key_t *key, crypto_spi_ctx_template_t template, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; int rv; int kmflag; @@ -320,8 +315,6 @@ blowfish_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, ctx->cc_provider_private = blowfish_ctx; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -345,8 +338,6 @@ blowfish_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, { int ret; -/* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; /* @@ -378,8 +369,6 @@ blowfish_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, ASSERT(blowfish_ctx->bc_remainder_len == 0); (void) blowfish_free_context(ctx); -/* EXPORT DELETE END */ - /* LINTED */ return (ret); } @@ -391,8 +380,6 @@ blowfish_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, { int ret; -/* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; /* @@ -424,8 +411,6 @@ blowfish_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, ASSERT(blowfish_ctx->bc_remainder_len == 0); (void) blowfish_free_context(ctx); -/* EXPORT DELETE END */ - /* LINTED */ return (ret); } @@ -561,9 +546,6 @@ static int blowfish_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; ASSERT(ctx->cc_provider_private != NULL); @@ -580,8 +562,6 @@ blowfish_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, (void) blowfish_free_context(ctx); data->cd_length = 0; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -590,9 +570,6 @@ static int blowfish_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - blowfish_ctx_t *blowfish_ctx; ASSERT(ctx->cc_provider_private != NULL); @@ -609,8 +586,6 @@ blowfish_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *data, (void) blowfish_free_context(ctx); data->cd_length = 0; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -797,9 +772,6 @@ blowfish_create_ctx_template(crypto_provider_handle_t provider, crypto_mechanism_t *mechanism, crypto_key_t *key, crypto_spi_ctx_template_t *tmpl, size_t *tmpl_size, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - void *keysched; size_t size; int rv; @@ -825,8 +797,6 @@ blowfish_create_ctx_template(crypto_provider_handle_t provider, *tmpl = keysched; *tmpl_size = size; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -859,8 +829,6 @@ blowfish_common_init_ctx(blowfish_ctx_t *blowfish_ctx, { int rv = CRYPTO_SUCCESS; -/* EXPORT DELETE START */ - void *keysched; size_t size; @@ -898,7 +866,5 @@ blowfish_common_init_ctx(blowfish_ctx_t *blowfish_ctx, } } -/* EXPORT DELETE END */ - return (rv); } diff --git a/usr/src/uts/common/crypto/io/rsa.c b/usr/src/uts/common/crypto/io/rsa.c index 6bb2f5b181..3542051a96 100644 --- a/usr/src/uts/common/crypto/io/rsa.c +++ b/usr/src/uts/common/crypto/io/rsa.c @@ -315,13 +315,9 @@ static int rsa_verify_common(rsa_mech_type_t, crypto_key_t *, crypto_data_t *, crypto_data_t *); static int compare_data(crypto_data_t *, uchar_t *); -/* EXPORT DELETE START */ - static int core_rsa_encrypt(crypto_key_t *, uchar_t *, int, uchar_t *, int); static int core_rsa_decrypt(crypto_key_t *, uchar_t *, int, uchar_t *); -/* EXPORT DELETE END */ - static crypto_kcf_provider_handle_t rsa_prov_handle = NULL; int @@ -373,8 +369,6 @@ check_mech_and_key(crypto_mechanism_t *mechanism, crypto_key_t *key) { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - uchar_t *modulus; ssize_t modulus_len; /* In bytes */ @@ -397,8 +391,6 @@ check_mech_and_key(crypto_mechanism_t *mechanism, crypto_key_t *key) modulus_len > MAX_RSA_KEYLENGTH_IN_BYTES) return (CRYPTO_KEY_SIZE_RANGE); -/* EXPORT DELETE END */ - return (rv); } @@ -598,8 +590,6 @@ rsa_encrypt_common(rsa_mech_type_t mech_type, crypto_key_t *key, { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - int plen; uchar_t *ptptr; uchar_t *modulus; @@ -656,13 +646,9 @@ rsa_encrypt_common(rsa_mech_type_t mech_type, crypto_key_t *key, ciphertext->cd_length = modulus_len; } -/* EXPORT DELETE END */ - return (rv); } -/* EXPORT DELETE START */ - static int core_rsa_encrypt(crypto_key_t *key, uchar_t *in, int in_len, uchar_t *out, int is_public) @@ -704,8 +690,6 @@ core_rsa_encrypt(crypto_key_t *key, uchar_t *in, return (rv); } -/* EXPORT DELETE END */ - /* ARGSUSED */ static int rsaprov_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, @@ -752,8 +736,6 @@ rsa_decrypt_common(rsa_mech_type_t mech_type, crypto_key_t *key, { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - size_t plain_len; uchar_t *ctptr; uchar_t *modulus; @@ -802,13 +784,9 @@ rsa_decrypt_common(rsa_mech_type_t mech_type, crypto_key_t *key, plaintext->cd_length = plain_len; } -/* EXPORT DELETE END */ - return (rv); } -/* EXPORT DELETE START */ - static int core_rsa_decrypt(crypto_key_t *key, uchar_t *in, int in_len, uchar_t *out) { @@ -863,8 +841,6 @@ core_rsa_decrypt(crypto_key_t *key, uchar_t *in, int in_len, uchar_t *out) return (rv); } -/* EXPORT DELETE END */ - /* ARGSUSED */ static int rsa_sign_verify_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, @@ -961,8 +937,6 @@ rsa_digest_svrfy_common(digest_rsa_ctx_t *ctxp, crypto_data_t *data, { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - uchar_t digest[SHA512_DIGEST_LENGTH]; /* The der_data size is enough for MD5 also */ uchar_t der_data[SHA512_DIGEST_LENGTH + SHA2_DER_PREFIX_Len]; @@ -1068,8 +1042,6 @@ rsa_digest_svrfy_common(digest_rsa_ctx_t *ctxp, crypto_data_t *data, rv = rsa_verify_common(mech_type, ctxp->key, &der_cd, signature); -/* EXPORT DELETE END */ - return (rv); } @@ -1079,8 +1051,6 @@ rsa_sign_common(rsa_mech_type_t mech_type, crypto_key_t *key, { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - int dlen; uchar_t *dataptr, *modulus; ssize_t modulus_len; @@ -1149,8 +1119,6 @@ rsa_sign_common(rsa_mech_type_t mech_type, crypto_key_t *key, signature->cd_length = modulus_len; } -/* EXPORT DELETE END */ - return (rv); } @@ -1297,8 +1265,6 @@ rsa_verify_common(rsa_mech_type_t mech_type, crypto_key_t *key, { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - uchar_t *sigptr, *modulus; ssize_t modulus_len; uchar_t plain_data[MAX_RSA_KEYLENGTH_IN_BYTES]; @@ -1346,8 +1312,6 @@ rsa_verify_common(rsa_mech_type_t mech_type, crypto_key_t *key, rv = CRYPTO_SIGNATURE_INVALID; } -/* EXPORT DELETE END */ - return (rv); } @@ -1503,8 +1467,6 @@ rsa_verify_recover_common(rsa_mech_type_t mech_type, crypto_key_t *key, { int rv = CRYPTO_FAILED; -/* EXPORT DELETE START */ - size_t data_len; uchar_t *sigptr, *modulus; ssize_t modulus_len; @@ -1551,8 +1513,6 @@ rsa_verify_recover_common(rsa_mech_type_t mech_type, crypto_key_t *key, return (rv); data->cd_length = data_len; -/* EXPORT DELETE END */ - return (rv); } diff --git a/usr/src/uts/common/des/Makefile b/usr/src/uts/common/des/Makefile index d8b634f1d3..9730d3bac4 100644 --- a/usr/src/uts/common/des/Makefile +++ b/usr/src/uts/common/des/Makefile @@ -19,8 +19,6 @@ # # CDDL HEADER END # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright (c) 1989,1999 by Sun Microsystems, Inc. # All rights reserved. # @@ -50,23 +48,4 @@ install_h: $(ROOTDIRS) $(ROOTHDRS) $(ROOTDIRS): $(INS.dir) -# EXPORT DELETE START -EXPORT_SRC: - $(RM) Makefile+ des_crypt.c+ des_soft.c+ desdata.h+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < des_crypt.c > des_crypt.c+ - $(MV) des_crypt.c+ des_crypt.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < des_soft.c > des_soft.c+ - $(MV) des_soft.c+ des_soft.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < desdata.h > desdata.h+ - $(MV) desdata.h+ desdata.h - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(RM) Makefile - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile des_crypt.c des_soft.c desdata.h - -# EXPORT DELETE END check: $(CHECKHDRS) diff --git a/usr/src/uts/common/des/des_crypt.c b/usr/src/uts/common/des/des_crypt.c index 9d489e4d74..f4f43a6e8e 100644 --- a/usr/src/uts/common/des/des_crypt.c +++ b/usr/src/uts/common/des/des_crypt.c @@ -51,7 +51,6 @@ #define _DES_IMPL #include <des/des_impl.h> -/* EXPORT DELETE START */ #include <sys/types.h> #include <rpc/des_crypt.h> #include <des/des.h> @@ -73,8 +72,6 @@ static int common_crypt(char *key, char *buf, size_t len, extern int _des_crypt(char *buf, size_t len, struct desparams *desp); -/* EXPORT DELETE END */ - extern struct mod_ops mod_cryptoops; /* @@ -97,15 +94,11 @@ static struct modlinkage modlinkage = { NULL }; -/* EXPORT DELETE START */ - #define DES_MIN_KEY_LEN DES_MINBYTES #define DES_MAX_KEY_LEN DES_MAXBYTES #define DES3_MIN_KEY_LEN DES3_MAXBYTES /* no CKK_DES2 support */ #define DES3_MAX_KEY_LEN DES3_MAXBYTES -/* EXPORT DELETE END */ - #ifndef DES_MIN_KEY_LEN #define DES_MIN_KEY_LEN 0 #endif @@ -311,14 +304,12 @@ int cbc_crypt(char *key, char *buf, size_t len, unsigned int mode, char *ivec) { int err = 0; -/* EXPORT DELETE START */ struct desparams dp; dp.des_mode = CBC; COPY8(ivec, dp.des_ivec); err = common_crypt(key, buf, len, mode, &dp); COPY8(dp.des_ivec, ivec); -/* EXPORT DELETE END */ return (err); } @@ -331,18 +322,15 @@ int ecb_crypt(char *key, char *buf, size_t len, unsigned int mode) { int err = 0; -/* EXPORT DELETE START */ struct desparams dp; dp.des_mode = ECB; err = common_crypt(key, buf, len, mode, &dp); -/* EXPORT DELETE END */ return (err); } -/* EXPORT DELETE START */ /* * Common code to cbc_crypt() & ecb_crypt() */ @@ -428,8 +416,6 @@ init_keysched(crypto_key_t *key, void *newbie, des_strength_t strength) return (CRYPTO_SUCCESS); } -/* EXPORT DELETE END */ - /* * KCF software provider control entry points. */ @@ -449,8 +435,6 @@ des_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, crypto_req_handle_t req) { -/* EXPORT DELETE START */ - des_strength_t strength; des_ctx_t *des_ctx = NULL; int rv; @@ -504,8 +488,6 @@ des_common_init(crypto_ctx_t *ctx, crypto_mechanism_t *mechanism, ctx->cc_provider_private = des_ctx; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -549,7 +531,6 @@ des_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, { int ret; -/* EXPORT DELETE START */ des_ctx_t *des_ctx; /* @@ -581,8 +562,6 @@ des_encrypt(crypto_ctx_t *ctx, crypto_data_t *plaintext, ASSERT(des_ctx->dc_remainder_len == 0); (void) des_free_context(ctx); -/* EXPORT DELETE END */ - /* LINTED */ return (ret); } @@ -594,7 +573,6 @@ des_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, { int ret; -/* EXPORT DELETE START */ des_ctx_t *des_ctx; /* @@ -626,8 +604,6 @@ des_decrypt(crypto_ctx_t *ctx, crypto_data_t *ciphertext, ASSERT(des_ctx->dc_remainder_len == 0); (void) des_free_context(ctx); -/* EXPORT DELETE END */ - /* LINTED */ return (ret); } @@ -641,8 +617,6 @@ des_encrypt_update(crypto_ctx_t *ctx, crypto_data_t *plaintext, size_t saved_length, out_len; int ret = CRYPTO_SUCCESS; -/* EXPORT DELETE START */ - ASSERT(ctx->cc_provider_private != NULL); DES_ARG_INPLACE(plaintext, ciphertext); @@ -693,8 +667,6 @@ des_encrypt_update(crypto_ctx_t *ctx, crypto_data_t *plaintext, } ciphertext->cd_offset = saved_offset; -/* EXPORT DELETE END */ - return (ret); } @@ -707,8 +679,6 @@ des_decrypt_update(crypto_ctx_t *ctx, crypto_data_t *ciphertext, size_t saved_length, out_len; int ret = CRYPTO_SUCCESS; -/* EXPORT DELETE START */ - ASSERT(ctx->cc_provider_private != NULL); DES_ARG_INPLACE(ciphertext, plaintext); @@ -759,8 +729,6 @@ des_decrypt_update(crypto_ctx_t *ctx, crypto_data_t *ciphertext, } plaintext->cd_offset = saved_offset; -/* EXPORT DELETE END */ - return (ret); } @@ -769,9 +737,6 @@ static int des_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *ciphertext, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - des_ctx_t *des_ctx; ASSERT(ctx->cc_provider_private != NULL); @@ -788,8 +753,6 @@ des_encrypt_final(crypto_ctx_t *ctx, crypto_data_t *ciphertext, (void) des_free_context(ctx); ciphertext->cd_length = 0; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -798,9 +761,6 @@ static int des_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *plaintext, crypto_req_handle_t req) { - -/* EXPORT DELETE START */ - des_ctx_t *des_ctx; ASSERT(ctx->cc_provider_private != NULL); @@ -817,8 +777,6 @@ des_decrypt_final(crypto_ctx_t *ctx, crypto_data_t *plaintext, (void) des_free_context(ctx); plaintext->cd_length = 0; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -831,8 +789,6 @@ des_encrypt_atomic(crypto_provider_handle_t provider, { int ret; -/* EXPORT DELETE START */ - des_ctx_t des_ctx; /* on the stack */ des_strength_t strength; off_t saved_offset; @@ -923,8 +879,6 @@ des_encrypt_atomic(crypto_provider_handle_t provider, } ciphertext->cd_offset = saved_offset; -/* EXPORT DELETE END */ - /* LINTED */ return (ret); } @@ -938,8 +892,6 @@ des_decrypt_atomic(crypto_provider_handle_t provider, { int ret; -/* EXPORT DELETE START */ - des_ctx_t des_ctx; /* on the stack */ des_strength_t strength; off_t saved_offset; @@ -1030,8 +982,6 @@ des_decrypt_atomic(crypto_provider_handle_t provider, } plaintext->cd_offset = saved_offset; -/* EXPORT DELETE END */ - /* LINTED */ return (ret); } @@ -1046,8 +996,6 @@ des_create_ctx_template(crypto_provider_handle_t provider, crypto_spi_ctx_template_t *tmpl, size_t *tmpl_size, crypto_req_handle_t req) { -/* EXPORT DELETE START */ - des_strength_t strength; void *keysched; size_t size; @@ -1088,8 +1036,6 @@ des_create_ctx_template(crypto_provider_handle_t provider, *tmpl = keysched; *tmpl_size = size; -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -1097,9 +1043,6 @@ des_create_ctx_template(crypto_provider_handle_t provider, static int des_free_context(crypto_ctx_t *ctx) { - -/* EXPORT DELETE START */ - des_ctx_t *des_ctx = ctx->cc_provider_private; if (des_ctx != NULL) { @@ -1113,8 +1056,6 @@ des_free_context(crypto_ctx_t *ctx) ctx->cc_provider_private = NULL; } -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -1127,9 +1068,6 @@ static int des_key_check(crypto_provider_handle_t pd, crypto_mechanism_t *mech, crypto_key_t *key) { - -/* EXPORT DELETE START */ - int expectedkeylen; des_strength_t strength; uint8_t keydata[DES3_MAX_KEY_LEN]; @@ -1163,8 +1101,6 @@ des_key_check(crypto_provider_handle_t pd, crypto_mechanism_t *mech, if (des_keycheck(keydata, strength, key->ck_data) == B_FALSE) return (CRYPTO_WEAK_KEY); -/* EXPORT DELETE END */ - return (CRYPTO_SUCCESS); } @@ -1176,8 +1112,6 @@ des_common_init_ctx(des_ctx_t *des_ctx, crypto_spi_ctx_template_t *template, { int rv = CRYPTO_SUCCESS; -/* EXPORT DELETE START */ - void *keysched; size_t size; @@ -1222,7 +1156,5 @@ des_common_init_ctx(des_ctx_t *des_ctx, crypto_spi_ctx_template_t *template, } } -/* EXPORT DELETE END */ - return (rv); } diff --git a/usr/src/uts/common/des/des_soft.c b/usr/src/uts/common/des/des_soft.c index af5d984467..96272ead1c 100644 --- a/usr/src/uts/common/des/des_soft.c +++ b/usr/src/uts/common/des/des_soft.c @@ -31,8 +31,6 @@ * under license from the Regents of the University of California. */ -#ident "%Z%%M% %I% %E% SMI" - /* * Warning! Things are arranged very carefully in this file to * allow read-only data to be moved to the text segment. The @@ -60,10 +58,8 @@ static void des_setkey(u_char userkey[8], struct deskeydata *kd, unsigned int dir); static void des_encrypt(u_char *data, struct deskeydata *kd); -/* EXPORT DELETE START */ #define btst(k, b) (k[b >> 3] & (0x80 >> (b & 07))) #define BIT28 (1<<28) -/* EXPORT DELETE END */ /* * Software encrypt or decrypt a block of data (multiple of 8 bytes) @@ -73,7 +69,6 @@ static void des_encrypt(u_char *data, struct deskeydata *kd); int _des_crypt(char *buf, size_t len, struct desparams *desp) { -/* EXPORT DELETE START */ short i; uint_t mode; uint_t dir; @@ -112,7 +107,6 @@ _des_crypt(char *buf, size_t len, struct desparams *desp) buf += 8; len -= 8; } -/* EXPORT DELETE END */ return (1); } @@ -125,7 +119,6 @@ _des_crypt(char *buf, size_t len, struct desparams *desp) static void des_setkey(u_char userkey[8], struct deskeydata *kd, unsigned int dir) { -/* EXPORT DELETE START */ int32_t C, D; short i; @@ -206,7 +199,6 @@ des_setkey(u_char userkey[8], struct deskeydata *kd, unsigned int dir) bbit >>= 8; } } -/* EXPORT DELETE END */ } @@ -222,7 +214,6 @@ des_setkey(u_char userkey[8], struct deskeydata *kd, unsigned int dir) static void des_encrypt(u_char *data, struct deskeydata *kd) { -/* EXPORT DELETE START */ chunk_t work1, work2; /* @@ -400,5 +391,4 @@ des_encrypt(u_char *data, struct deskeydata *kd) data[5] = work2.byte5; data[6] = work2.byte6; data[7] = work2.byte7; -/* EXPORT DELETE END */ } diff --git a/usr/src/uts/common/des/desdata.h b/usr/src/uts/common/des/desdata.h index b03631f224..1f2c24b686 100644 --- a/usr/src/uts/common/des/desdata.h +++ b/usr/src/uts/common/des/desdata.h @@ -34,8 +34,6 @@ #ifndef _SYS_DESDATA_H #define _SYS_DESDATA_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -52,7 +50,6 @@ extern "C" { #define static #endif -/* EXPORT DELETE START */ /* * Permuted-choice 1 from the key bits * to yield C and D. @@ -1081,7 +1078,6 @@ const uint32_t P_tab[4][256] = { 0x0a100401U, 0x0a100c01U, 0x0a120401U, 0x0a120c01U, 0x0a100421U, 0x0a100c21U, 0x0a120421U, 0x0a120c21U, }; -/* EXPORT DELETE END */ #ifdef __cplusplus } diff --git a/usr/src/uts/common/gssapi/Makefile b/usr/src/uts/common/gssapi/Makefile index 0f02a03623..736ac8da68 100644 --- a/usr/src/uts/common/gssapi/Makefile +++ b/usr/src/uts/common/gssapi/Makefile @@ -88,36 +88,3 @@ check: $(CHECKHDRS) clean: $(RM) $(DERIVED_FILES) - -# EXPORT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) Makefile+ gssd.x+ gssd_clnt_stubs.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < gssd.x > gssd.x+ - $(MV) gssd.x+ gssd.x - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < gssd_clnt_stubs.c > gssd_clnt_stubs.c+ - $(MV) gssd_clnt_stubs.c+ gssd_clnt_stubs.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile gssd.x gssd_clnt_stubs.c - -# CRYPT DELETE START -# Special target to clean up the source tree for domestic distribution -# Warning: This target changes the source tree - -CRYPT_SRC: - $(RM) Makefile+ gssd_clnt_stubs.c+ - sed -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < gssd_clnt_stubs.c > gssd_clnt_stubs.c+ - $(MV) gssd_clnt_stubs.c+ gssd_clnt_stubs.c - $(CHMOD) 444 Makefile gssd_clnt_stubs.c - -# CRYPT DELETE END -# EXPORT DELETE END diff --git a/usr/src/uts/common/gssapi/gssd.x b/usr/src/uts/common/gssapi/gssd.x index ef4a502dc4..439b739608 100644 --- a/usr/src/uts/common/gssapi/gssd.x +++ b/usr/src/uts/common/gssapi/gssd.x @@ -24,8 +24,6 @@ % * Use is subject to license terms. % */ % -%#pragma ident "%Z%%M% %I% %E% SMI" -% %/* % * RPC protocol information for gssd, the usermode daemon that % * assists the kernel with gssapi. It is gssd that executes all @@ -265,7 +263,6 @@ struct gss_verify_res { OM_UINT32 status; /* status of GSSAPI call */ }; -%/* EXPORT DELETE START */ struct gss_seal_arg { OM_UINT32 gssd_context_verifier; /* verifier for context handles */ GSS_CTX_ID_T context_handle; /* handle to existing context */ @@ -295,8 +292,6 @@ struct gss_unseal_res { OM_UINT32 status; /* status of GSSAPI call */ }; -%/* EXPORT DELETE END */ - struct gss_display_status_arg { uid_t uid; /* client uid */ int status_value; /* status to be converted */ @@ -482,8 +477,6 @@ program GSSPROG { GSS_INQUIRE_CRED(gss_inquire_cred_arg) = 12; -/* EXPORT DELETE START */ - /* * Called to seal a message. */ @@ -494,8 +487,6 @@ program GSSPROG { */ gss_unseal_res GSS_UNSEAL(gss_unseal_arg) = 14; -/* EXPORT DELETE END */ - /* * gsscred interface functions to obtain principal uid and gids */ diff --git a/usr/src/uts/common/gssapi/gssd_clnt_stubs.c b/usr/src/uts/common/gssapi/gssd_clnt_stubs.c index 6dc6b7737a..c934752798 100644 --- a/usr/src/uts/common/gssapi/gssd_clnt_stubs.c +++ b/usr/src/uts/common/gssapi/gssd_clnt_stubs.c @@ -70,14 +70,12 @@ static OM_uint32 kgss_sign_wrapped(void *, OM_uint32 *, gss_ctx_id_t, int, static OM_uint32 kgss_verify_wrapped(void *, OM_uint32 *, gss_ctx_id_t, gss_buffer_t, gss_buffer_t, int *qop_state, OM_uint32); -/* EXPORT DELETE START */ static OM_uint32 kgss_seal_wrapped(void *, OM_uint32 *, gss_ctx_id_t, int, int, gss_buffer_t, int *, gss_buffer_t, OM_uint32); static OM_uint32 kgss_unseal_wrapped(void *, OM_uint32 *, gss_ctx_id_t, gss_buffer_t, gss_buffer_t, int *conf_state, int *qop_state, OM_uint32); -/* EXPORT DELETE END */ static OM_uint32 kgss_delete_sec_context_wrapped(void *, OM_uint32 *, gssd_ctx_id_t *, gss_buffer_t, OM_uint32); @@ -821,24 +819,10 @@ static struct gss_config default_gc = { NULL, NULL, 0, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ kgss_unseal_wrapped, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ NULL, /* kgss_delete_sec_context_wrapped */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ kgss_seal_wrapped, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ NULL, /* kgss_import_sec_context */ -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ -#if 0 -/* CRYPT DELETE END */ - kgss_seal_wrapped, - kgss_unseal_wrapped, -/* CRYPT DELETE START */ -#endif -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ kgss_sign_wrapped, kgss_verify_wrapped }; @@ -1789,8 +1773,6 @@ kgss_verify(OM_uint32 *minor_status, message_buffer, token_buffer, qop_state)); } -/* EXPORT DELETE START */ - /*ARGSUSED*/ static OM_uint32 kgss_seal_wrapped(void *private, @@ -2021,8 +2003,6 @@ kgss_unseal(OM_uint32 *minor_status, output_message_buffer, conf_state, qop_state)); } -/* EXPORT DELETE END */ - OM_uint32 kgss_display_status(minor_status, status_value, diff --git a/usr/src/uts/common/gssapi/include/Makefile b/usr/src/uts/common/gssapi/include/Makefile deleted file mode 100644 index 305577fa33..0000000000 --- a/usr/src/uts/common/gssapi/include/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 1997-2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" - -# include global definitions -include ../../../../Makefile.master - -# EXPORT DELETE START - -all: - @$(ECHO) " This Makefile is used to clean up the source tree\n" \ - "for export distribution.\n" \ - "[Usage]: make [EXPORT_SRC] [CRYPT_SRC]\n\n" \ - "WARNING: EXPORT_SRC, CRYPT_SRC targets change the\n" \ - "source tree and remove the Makefile." - -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree and removes this Makefile - -EXPORT_SRC: - $(RM) gssapiP_dummy.h+ mechglueP.h+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < gssapiP_dummy.h > gssapiP_dummy.h+ - $(MV) gssapiP_dummy.h+ gssapiP_dummy.h - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mechglueP.h > mechglueP.h+ - $(MV) mechglueP.h+ mechglueP.h - $(RM) Makefile - $(CHMOD) 444 gssapiP_dummy.h mechglueP.h - -# CRYPT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree. - -CRYPT_SRC: - $(RM) mechglueP.h+ Makefile+ - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < mechglueP.h > mechglueP.h+ - $(MV) mechglueP.h+ mechglueP.h - sed -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 mechglueP.h Makefile - -# CRYPT DELETE END -# EXPORT DELETE END diff --git a/usr/src/uts/common/gssapi/include/gssapiP_dummy.h b/usr/src/uts/common/gssapi/include/gssapiP_dummy.h index 403afe095a..1b4d1ca4a6 100644 --- a/usr/src/uts/common/gssapi/include/gssapiP_dummy.h +++ b/usr/src/uts/common/gssapi/include/gssapiP_dummy.h @@ -27,8 +27,6 @@ #ifndef _GSSAPIP_DUMMY_H #define _GSSAPIP_DUMMY_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -215,7 +213,7 @@ DUMMY_STATIC OM_uint32 dummy_gss_verify #endif /* */); -/* EXPORT DELETE START */ + DUMMY_STATIC OM_uint32 dummy_gss_seal ( void *, /* dummy context */ @@ -244,7 +242,6 @@ DUMMY_STATIC OM_uint32 dummy_gss_unseal /* */, OM_uint32 #endif /* */); -/* EXPORT DELETE END */ OM_uint32 dummy_gss_display_status ( diff --git a/usr/src/uts/common/gssapi/include/mechglueP.h b/usr/src/uts/common/gssapi/include/mechglueP.h index 479a940a08..f79b660c85 100644 --- a/usr/src/uts/common/gssapi/include/mechglueP.h +++ b/usr/src/uts/common/gssapi/include/mechglueP.h @@ -222,7 +222,6 @@ typedef struct gss_config { OM_uint32 *, /* time_rec */ gss_cred_id_t * /* delegated_cred_handle */ /* */); -/* EXPORT DELETE START */ /* CRYPT DELETE START */ #endif /* ! _KERNEL */ /* @@ -242,7 +241,6 @@ typedef struct gss_config { #endif /* */); #ifndef _KERNEL -/* EXPORT DELETE END */ /* CRYPT DELETE END */ OM_uint32 (*gss_process_context_token) ( void *, /* context */ @@ -340,7 +338,6 @@ typedef struct gss_config { OM_uint32 *, /* initiator_time_rec */ OM_uint32 * /* acceptor_time_rec */ /* */); -/* EXPORT DELETE START */ /* CRYPT DELETE START */ #endif /* ! _KERNEL */ /* * Note: there are two gss_seal's in here. Make any changes to both. @@ -360,7 +357,6 @@ typedef struct gss_config { #endif /* */); #ifndef _KERNEL -/* EXPORT DELETE END */ /* CRYPT DELETE END */ OM_uint32 (*gss_export_sec_context) ( void *, /* context */ @@ -447,52 +443,6 @@ typedef struct gss_config { gss_buffer_t /* exported_name */ /* */); #endif /* ! _KERNEL */ -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ -/* - * This block comment is Sun Proprietary: Need-To-Know. - * What we are doing is leaving the seal and unseal entry points - * in an obvious place before sign and unsign for the Domestic customer - * of the Solaris Source Product. The Domestic customer of the Solaris Source - * Product will have to deal with the problem of creating exportable libgss - * binaries. - * In the binary product that Sun builds, these entry points are elsewhere, - * and bracketed with special comments so that the CRYPT_SRC and EXPORT_SRC - * targets delete them. - */ -#if 0 -/* CRYPT DELETE END */ - OM_uint32 (*gss_seal) - ( - void *, /* context */ - OM_uint32 *, /* minor_status */ - const gss_ctx_id_t, /* context_handle */ - int, /* conf_req_flag */ - int, /* qop_req */ - const gss_buffer_t, /* input_message_buffer */ - int *, /* conf_state */ - gss_buffer_t /* output_message_buffer */ -#ifdef _KERNEL - /* */, OM_uint32 -#endif - /* */); - OM_uint32 (*gss_unseal) - ( - void *, /* context */ - OM_uint32 *, /* minor_status */ - const gss_ctx_id_t, /* context_handle */ - const gss_buffer_t, /* input_message_buffer */ - gss_buffer_t, /* output_message_buffer */ - int *, /* conf_state */ - int * /* qop_state */ -#ifdef _KERNEL - /* */, OM_uint32 -#endif - /* */); -/* CRYPT DELETE START */ -#endif /* 0 */ -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ OM_uint32 (*gss_sign) ( void *, /* context */ @@ -801,7 +751,6 @@ struct kgss_ctx { (*(KCTX_TO_MECH(ctx)->gss_import_sec_context))(KCTX_TO_PRIVATE(ctx),\ minor_st, tkn, int_ctx_id) -/* EXPORT DELETE START */ #define KGSS_SEAL(minor_st, ctx, conf_req, qop, msg, conf_state, tkn) \ (*(KCTX_TO_MECH(ctx)->gss_seal))(KCTX_TO_PRIVATE(ctx), minor_st, \ KCTX_TO_CTX(ctx), conf_req, qop, msg, conf_state, tkn,\ @@ -812,8 +761,6 @@ struct kgss_ctx { KCTX_TO_CTX(ctx), msg, tkn, conf, qop, \ KCTX_TO_CTXV(ctx)) -/* EXPORT DELETE END */ - #define KGSS_INIT_CONTEXT(ctx) krb5_init_context(ctx) #define KGSS_RELEASE_OID(minor_st, oid) krb5_gss_release_oid(minor_st, oid) extern OM_uint32 kgss_release_oid(OM_uint32 *, gss_OID *); diff --git a/usr/src/uts/common/gssapi/mechs/dummy/Makefile b/usr/src/uts/common/gssapi/mechs/dummy/Makefile deleted file mode 100644 index 4c3fa353fa..0000000000 --- a/usr/src/uts/common/gssapi/mechs/dummy/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# 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. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 1997-2001 by Sun Microsystems, Inc. -# All rights reserved. -# -#pragma ident "%Z%%M% %I% %E% SMI" - -include ../../../../../Makefile.master - -# EXPORT DELETE START - -all: - @$(ECHO) " This Makefile is used to clean up the source tree\n" \ - "for export distribution.\n" \ - "[Usage]: make [EXPORT_SRC] [CRYPT_SRC]\n\n" \ - "WARNING: EXPORT_SRC, CRYPT_SRC targets change the\n" \ - "source tree and remove the Makefile." - -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree and removes this Makefile - -EXPORT_SRC: - $(RM) dmech.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < dmech.c > dmech.c+ - $(MV) dmech.c+ dmech.c - $(RM) Makefile - $(CHMOD) 444 dmech.c - -# CRYPT DELETE START -# CRYPT DELETE START -# Special target to clean up the source tree for domestic distribution -# Warning: This target changes the source tree - -CRYPT_SRC: - $(RM) dmech.c+ Makefile+ - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < dmech.c > dmech.c+ - $(MV) dmech.c+ dmech.c - sed -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 dmech.c Makefile - -# CRYPT DELETE END -# EXPORT DELETE END diff --git a/usr/src/uts/common/gssapi/mechs/dummy/dmech.c b/usr/src/uts/common/gssapi/mechs/dummy/dmech.c index 04f0949d24..411a000c63 100644 --- a/usr/src/uts/common/gssapi/mechs/dummy/dmech.c +++ b/usr/src/uts/common/gssapi/mechs/dummy/dmech.c @@ -89,24 +89,10 @@ static struct gss_config dummy_mechanism = NULL, /* context */ NULL, /* next */ TRUE, /* uses_kmod */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ dummy_gss_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ dummy_gss_delete_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ dummy_gss_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ dummy_gss_import_sec_context, -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ -#if 0 -/* CRYPT DELETE END */ - dummy_gss_seal, - dummy_gss_unseal, -/* CRYPT DELETE START */ -#endif -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ dummy_gss_sign, dummy_gss_verify }; @@ -275,7 +261,6 @@ static OM_uint32 return (GSS_S_COMPLETE); } -/* EXPORT DELETE START */ /*ARGSUSED*/ static OM_uint32 dummy_gss_seal(context, minor_status, context_handle, conf_req_flag, @@ -363,8 +348,6 @@ dummy_gss_unseal(context, minor_status, context_handle, return (GSS_S_COMPLETE); } -/* EXPORT DELETE END */ - /*ARGSUSED*/ OM_uint32 dummy_gss_import_sec_context(ct, minor_status, interprocess_token, diff --git a/usr/src/uts/common/gssapi/mechs/krb5/Makefile b/usr/src/uts/common/gssapi/mechs/krb5/Makefile deleted file mode 100644 index 8437419537..0000000000 --- a/usr/src/uts/common/gssapi/mechs/krb5/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright 1997-2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# /usr/src/uts/common/gssapi/mechs/krb5/Makefile - -include ../../../../../Makefile.master - -# EXPORT DELETE START - -all: - @$(ECHO) " This Makefile is used to clean up the source tree\n" \ - "for export distribution.\n" \ - "[Usage]: make [EXPORT_SRC] [CRYPT_SRC]\n\n" \ - "WARNING: EXPORT_SRC, CRYPT_SRC targets change the\n" \ - "source tree and remove the Makefile." - -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) krb5mech.c+ include/gssapiP_krb5.h+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < include/gssapiP_krb5.h > include/gssapiP_krb5.h+ - $(MV) include/gssapiP_krb5.h+ include/gssapiP_krb5.h - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < krb5mech.c > krb5mech.c+ - $(MV) krb5mech.c+ krb5mech.c - - $(RM) crypto/des/f_cbc.c+ crypto/des/f_cksum.c+ \ - crypto/des/d3_cbc.c+ mech/seal.c+ mech/unseal.c+ - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/seal.c > mech/seal.c+ - $(MV) mech/seal.c+ mech/seal.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/unseal.c > mech/unseal.c+ - $(MV) mech/unseal.c+ mech/unseal.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < crypto/des/f_cbc.c > crypto/des/f_cbc.c+ - $(MV) crypto/des/f_cbc.c+ crypto/des/f_cbc.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < crypto/des/d3_cbc.c > crypto/des/d3_cbc.c+ - $(MV) crypto/des/d3_cbc.c+ crypto/des/d3_cbc.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < crypto/des/f_cksum.c > crypto/des/f_cksum.c+ - $(MV) crypto/des/f_cksum.c+ crypto/des/f_cksum.c - - $(RM) ../../../Makefile.files+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < ../../../Makefile.files > ../../../Makefile.files+ - $(MV) ../../../Makefile.files+ ../../../Makefile.files - - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - - $(CHMOD) 444 krb5mech.c include/gssapiP_krb5.h crypto/des/f_cbc.c \ - crypto/des/f_cksum.c crypto/des/d3_cbc.c \ - mech/seal.c mech/unseal.c - -# CRYPT DELETE START -# Special target to clean up the source tree for domestic distribution -# Warning: This target changes the source tree -CRYPT_SRC: - $(RM) krb5mech.c+ - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < krb5mech.c > krb5mech.c+ - $(MV) krb5mech.c+ krb5mech.c - - $(RM) Makefile+ - sed -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - - $(CHMOD) 444 krb5mech.c Makefile -# CRYPT DELETE END -# EXPORT DELETE END diff --git a/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/d3_cbc.c b/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/d3_cbc.c index 4f8ee963f8..bedea49b0f 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/d3_cbc.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/d3_cbc.c @@ -37,7 +37,6 @@ mit_des3_cbc_encrypt(krb5_context context, const mit_des_cblock *in, mit_des_cbl const mit_des_cblock ivec, int encrypt) { int ret = KRB5_PROG_ETYPE_NOSUPP; -/* EXPORT DELETE START */ KRB5_MECH_TO_PKCS algos; CK_MECHANISM mechanism; CK_RV rv; @@ -99,7 +98,6 @@ final_cleanup: if (ret) (void) memset(out, 0, length); -/* EXPORT DELETE END */ KRB5_LOG(KRB5_INFO, "mit_des3_cbc_encrypt() end ret=%d\n", ret); return(ret); } @@ -116,7 +114,6 @@ mit_des3_cbc_encrypt(krb5_context context, const mit_des_cblock ivec, int encrypt) { int ret = KRB5_PROG_ETYPE_NOSUPP; -/* EXPORT DELETE START */ krb5_data ivdata; KRB5_LOG(KRB5_INFO, "mit_des3_cbc_encrypt() start encrypt=%d", encrypt); @@ -127,7 +124,6 @@ mit_des3_cbc_encrypt(krb5_context context, ret = k5_ef_crypto((const char *)in, (char *)out, length, key, &ivdata, encrypt); -/* EXPORT DELETE END */ KRB5_LOG(KRB5_INFO, "mit_des3_cbc_encrypt() end retval=%d", ret); return(ret); } diff --git a/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cbc.c b/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cbc.c index 10fe4f01d7..b5577c86bb 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cbc.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cbc.c @@ -40,7 +40,6 @@ mit_des_cbc_encrypt(context, in, out, length, key, ivec, encrypt) int encrypt; { krb5_error_code ret = KRB5_PROG_ETYPE_NOSUPP; -/* EXPORT DELETE START */ KRB5_MECH_TO_PKCS algos; CK_MECHANISM mechanism; CK_RV rv; @@ -102,7 +101,6 @@ final_cleanup: if (ret) (void) memset(out, 0, length); -/* EXPORT DELETE END */ KRB5_LOG(KRB5_INFO, "mit_des_cbc_encrypt() end retval=%d", ret); return(ret); @@ -137,7 +135,6 @@ mit_des_cbc_encrypt(krb5_context context, mit_des_cblock ivec, int encrypt) { int ret = KRB5_PROG_ETYPE_NOSUPP; -/* EXPORT DELETE START */ krb5_data ivdata; ret = 0; @@ -149,7 +146,6 @@ mit_des_cbc_encrypt(krb5_context context, ret = k5_ef_crypto((const char *)in, (char *)out, length, key, &ivdata, encrypt); -/* EXPORT DELETE END */ KRB5_LOG(KRB5_INFO, "mit_des_cbc_encrypt() end retval=%d", ret); return(ret); } diff --git a/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cksum.c b/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cksum.c index a5c46373ff..639924c309 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cksum.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_cksum.c @@ -30,7 +30,6 @@ mit_des_cbc_cksum(krb5_context context, const krb5_octet *ivec) { krb5_error_code ret = 0; -/* EXPORT DELETE START */ krb5_data input; krb5_data output; krb5_data ivecdata; @@ -45,6 +44,5 @@ mit_des_cbc_cksum(krb5_context context, ret = k5_ef_mac(context, key, &ivecdata, (const krb5_data *)&input, &output); -/* EXPORT DELETE END */ return (ret); } diff --git a/usr/src/uts/common/gssapi/mechs/krb5/include/gssapiP_krb5.h b/usr/src/uts/common/gssapi/mechs/krb5/include/gssapiP_krb5.h index 1a2f404170..521daacd40 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/include/gssapiP_krb5.h +++ b/usr/src/uts/common/gssapi/mechs/krb5/include/gssapiP_krb5.h @@ -428,7 +428,6 @@ OM_uint32 krb5_gss_verify #endif ); -/* EXPORT DELETE START */ OM_uint32 krb5_gss_seal (OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -453,7 +452,6 @@ OM_uint32 krb5_gss_unseal /* */, OM_uint32 /* context verifier */ #endif ); -/* EXPORT DELETE END */ OM_uint32 krb5_gss_display_status (OM_uint32*, /* minor_status */ diff --git a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c index 00a8d7be18..d477d03a20 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c @@ -61,7 +61,6 @@ static OM_uint32 k5glue_verify int *, /* qop_state */ OM_uint32); -/* EXPORT DELETE START */ static OM_uint32 k5glue_seal (void *, OM_uint32 *, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -80,7 +79,6 @@ static OM_uint32 k5glue_unseal int *, /* conf_state */ int *, /* qop_state */ OM_uint32); -/* EXPORT DELETE END */ static OM_uint32 k5glue_import_sec_context (void *, OM_uint32 *, /* minor_status */ @@ -94,24 +92,10 @@ static struct gss_config krb5_mechanism = NULL, /* context */ NULL, /* next */ TRUE, /* uses_kmod */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_delete_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_import_sec_context, -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ -#if 0 -/* CRYPT DELETE END */ - k5glue_seal, - k5glue_unseal, -/* CRYPT DELETE START */ -#endif -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ k5glue_sign, k5glue_verify, }; @@ -223,7 +207,6 @@ k5glue_import_sec_context(ctx, minor_status, interprocess_token, context_handle) context_handle)); } -/* EXPORT DELETE START */ /* V1 only */ /* ARGSUSED */ static OM_uint32 @@ -244,7 +227,6 @@ k5glue_seal(ctx, minor_status, context_handle, conf_req_flag, qop_req, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer, gssd_ctx_verifier)); } -/* EXPORT DELETE END */ /* ARGSUSED */ static OM_uint32 @@ -263,7 +245,6 @@ k5glue_sign(ctx, minor_status, context_handle, qop_req, message_buffer, message_token, gssd_ctx_verifier)); } -/* EXPORT DELETE START */ /* ARGSUSED */ static OM_uint32 k5glue_unseal(ctx, minor_status, context_handle, input_message_buffer, @@ -281,7 +262,6 @@ k5glue_unseal(ctx, minor_status, context_handle, input_message_buffer, input_message_buffer, output_message_buffer, conf_state, qop_state, gssd_ctx_verifier)); } -/* EXPORT DELETE END */ /* V1 only */ /* ARGSUSED */ diff --git a/usr/src/uts/common/gssapi/mechs/krb5/mech/seal.c b/usr/src/uts/common/gssapi/mechs/krb5/mech/seal.c index 9ff22e20bf..7bd4f00225 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/mech/seal.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/mech/seal.c @@ -1,12 +1,8 @@ -/* EXPORT DELETE START */ - /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Copyright 1993 by OpenVision Technologies, Inc. * @@ -91,5 +87,3 @@ krb5_gss_wrap(minor_status, context_handle, conf_req_flag, output_message_buffer, KG_TOK_WRAP_MSG)); #endif } - -/* EXPORT DELETE END */ diff --git a/usr/src/uts/common/gssapi/mechs/krb5/mech/unseal.c b/usr/src/uts/common/gssapi/mechs/krb5/mech/unseal.c index 7636d01dba..d46d7dade6 100644 --- a/usr/src/uts/common/gssapi/mechs/krb5/mech/unseal.c +++ b/usr/src/uts/common/gssapi/mechs/krb5/mech/unseal.c @@ -1,5 +1,3 @@ -/* EXPORT DELETE START */ - /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -84,5 +82,3 @@ krb5_gss_unwrap(minor_status, context_handle, return(rstat); #endif } - -/* EXPORT DELETE END */ diff --git a/usr/src/uts/common/io/timod.c b/usr/src/uts/common/io/timod.c index 41bf9ce7dc..57817c2f79 100644 --- a/usr/src/uts/common/io/timod.c +++ b/usr/src/uts/common/io/timod.c @@ -18,7 +18,6 @@ * * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. @@ -31,7 +30,6 @@ * Transport Interface Library cooperating module - issue 2 */ -/* ONC_PLUS EXTRACT END */ #include <sys/param.h> #include <sys/types.h> #include <sys/stream.h> @@ -195,9 +193,7 @@ struct tim_tim { #define LOCORDREL 0x0020 /* local end has orderly released */ #define REMORDREL 0x0040 /* remote end had orderly released */ #define NAMEPROC 0x0080 /* processing a NAME ioctl */ -/* ONC_PLUS EXTRACT START */ #define DO_MYNAME 0x0100 /* timod handles TI_GETMYNAME */ -/* ONC_PLUS EXTRACT END */ #define DO_PEERNAME 0x0200 /* timod handles TI_GETPEERNAME */ #define TI_CAP_RECVD 0x0400 /* TI_CAPABILITY received */ #define CAP_WANTS_INFO 0x0800 /* TI_CAPABILITY has TC1_INFO set */ @@ -313,20 +309,14 @@ int dotilog = 0; #define TIMOD_ID 3 -/* ONC_PLUS EXTRACT START */ static int timodopen(queue_t *, dev_t *, int, int, cred_t *); -/* ONC_PLUS EXTRACT END */ static int timodclose(queue_t *, int, cred_t *); static void timodwput(queue_t *, mblk_t *); static void timodrput(queue_t *, mblk_t *); -/* ONC_PLUS EXTRACT START */ static void timodrsrv(queue_t *); -/* ONC_PLUS EXTRACT END */ static void timodwsrv(queue_t *); -/* ONC_PLUS EXTRACT START */ static int timodrproc(queue_t *, mblk_t *); static int timodwproc(queue_t *, mblk_t *); -/* ONC_PLUS EXTRACT END */ /* stream data structure definitions */ @@ -352,7 +342,6 @@ static struct qinit timodwinit = { }; static struct streamtab timinfo = { &timodrinit, &timodwinit, NULL, NULL }; -/* ONC_PLUS EXTRACT START */ /* * timodopen - open routine gets called when the module gets pushed * onto the stream. @@ -488,7 +477,6 @@ tim_buffer(void *arg) enableok(q); qenable(q); } -/* ONC_PLUS EXTRACT END */ /* * timodclose - This routine gets called when the module gets popped @@ -637,7 +625,6 @@ timodrput(queue_t *q, mblk_t *mp) } } -/* ONC_PLUS EXTRACT START */ /* * timodrsrv - Module read queue service procedure. This is called when * messages are placed on an empty queue, when high priority @@ -652,7 +639,6 @@ timodrput(queue_t *q, mblk_t *mp) static void timodrsrv(queue_t *q) { -/* ONC_PLUS EXTRACT END */ mblk_t *mp; struct tim_tim *tp; @@ -671,7 +657,6 @@ timodrsrv(queue_t *q) return; } } -/* ONC_PLUS EXTRACT START */ } /* @@ -701,11 +686,9 @@ timodrproc(queue_t *q, mblk_t *mp) struct iocblk *iocbp; mblk_t *nbp; size_t blen; -/* ONC_PLUS EXTRACT END */ tp = (struct tim_tim *)q->q_ptr; -/* ONC_PLUS EXTRACT START */ switch (mp->b_datap->db_type) { default: putnext(q, mp); @@ -786,14 +769,11 @@ timodrproc(queue_t *q, mblk_t *mp) pptr = (union T_primitives *)mp->b_rptr; switch (pptr->type) { default: -/* ONC_PLUS EXTRACT END */ if (auditing) audit_sock(T_UNITDATA_IND, q, mp, TIMOD_ID); -/* ONC_PLUS EXTRACT START */ putnext(q, mp); break; -/* ONC_PLUS EXTRACT END */ case T_ERROR_ACK: /* Restore db_type - recover() might have changed it */ @@ -903,7 +883,6 @@ timodrproc(queue_t *q, mblk_t *mp) tim_send_reply(q, mp, tp, pptr->ok_ack.CORRECT_prim); break; -/* ONC_PLUS EXTRACT START */ case T_BIND_ACK: { struct T_bind_ack *ackp = (struct T_bind_ack *)mp->b_rptr; @@ -967,7 +946,6 @@ timodrproc(queue_t *q, mblk_t *mp) break; } -/* ONC_PLUS EXTRACT END */ case T_OPTMGMT_ACK: tilog("timodrproc: Got T_OPTMGMT_ACK\n", 0); @@ -1200,7 +1178,6 @@ timodrproc(queue_t *q, mblk_t *mp) tim_send_reply(q, mp, tp, T_ADDR_REQ); break; -/* ONC_PLUS EXTRACT START */ case T_CONN_IND: { struct T_conn_ind *tcip = (struct T_conn_ind *)mp->b_rptr; @@ -1219,15 +1196,12 @@ timodrproc(queue_t *q, mblk_t *mp) return (1); } } -/* ONC_PLUS EXTRACT END */ if (auditing) audit_sock(T_CONN_IND, q, mp, TIMOD_ID); -/* ONC_PLUS EXTRACT START */ putnext(q, mp); break; } -/* ONC_PLUS EXTRACT END */ case T_CONN_CON: mutex_enter(&tp->tim_mutex); if (tp->tim_peercred != NULL) @@ -1340,7 +1314,6 @@ timodrproc(queue_t *q, mblk_t *mp) } break; -/* ONC_PLUS EXTRACT START */ case M_FLUSH: tilog("timodrproc: Got M_FLUSH\n", 0); @@ -1353,7 +1326,6 @@ timodrproc(queue_t *q, mblk_t *mp) } putnext(q, mp); break; -/* ONC_PLUS EXTRACT END */ case M_IOCACK: iocbp = (struct iocblk *)mp->b_rptr; @@ -1429,7 +1401,6 @@ timodrproc(queue_t *q, mblk_t *mp) putnext(q, mp); break; -/* ONC_PLUS EXTRACT START */ case M_IOCNAK: tilog("timodrproc: Got M_IOCNAK\n", 0); @@ -1462,13 +1433,11 @@ timodrproc(queue_t *q, mblk_t *mp) } putnext(q, mp); break; -/* ONC_PLUS EXTRACT END */ } return (0); } -/* ONC_PLUS EXTRACT START */ /* * timodwput - Module write put procedure. This is called from * the module, driver, or stream head upstream/downstream. @@ -1490,7 +1459,6 @@ timodwput(queue_t *q, mblk_t *mp) * enqueue those M_IOCTLs which will result in an * M_PCPROTO (ie, high priority) message being created. */ -/* ONC_PLUS EXTRACT END */ if (q->q_first != 0 && mp->b_datap->db_type < QPCTL) { if (mp->b_datap->db_type == M_IOCTL) { iocbp = (struct iocblk *)mp->b_rptr; @@ -1509,7 +1477,6 @@ timodwput(queue_t *q, mblk_t *mp) return; } } -/* ONC_PLUS EXTRACT START */ /* * Inline processing of data (to avoid additional procedure call). * Rest is handled in timodwproc. @@ -1538,7 +1505,6 @@ timodwput(queue_t *q, mblk_t *mp) case M_PCPROTO: pptr = (union T_primitives *)mp->b_rptr; switch (pptr->type) { -/* ONC_PLUS EXTRACT END */ case T_UNITDATA_REQ: tp = (struct tim_tim *)q->q_ptr; ASSERT(tp); @@ -1571,7 +1537,6 @@ timodwput(queue_t *q, mblk_t *mp) break; } break; -/* ONC_PLUS EXTRACT START */ default: (void) timodwproc(q, mp); break; @@ -1627,7 +1592,6 @@ timodwproc(queue_t *q, mblk_t *mp) default: putnext(q, mp); break; -/* ONC_PLUS EXTRACT END */ case M_DATA: if (tp->tim_flags & CLTS) { @@ -1644,7 +1608,6 @@ timodwproc(queue_t *q, mblk_t *mp) putnext(q, mp); break; -/* ONC_PLUS EXTRACT START */ case M_IOCTL: iocbp = (struct iocblk *)mp->b_rptr; @@ -1669,7 +1632,6 @@ timodwproc(queue_t *q, mblk_t *mp) tim_ioctl_retry(q); return (1); } -/* ONC_PLUS EXTRACT END */ switch (iocbp->ioc_cmd) { default: @@ -1919,7 +1881,6 @@ timodwproc(queue_t *q, mblk_t *mp) } break; -/* ONC_PLUS EXTRACT START */ case TI_GETMYNAME: tilog("timodwproc: Got TI_GETMYNAME\n", 0); @@ -1989,7 +1950,6 @@ getname: } putnext(q, mp); break; -/* ONC_PLUS EXTRACT END */ case T_UNITDATA_REQ: if (tp->tim_flags & CLTS) { @@ -2009,7 +1969,6 @@ getname: putnext(q, mp); break; -/* ONC_PLUS EXTRACT START */ case T_CONN_REQ: { struct T_conn_req *reqp = (struct T_conn_req *) mp->b_rptr; @@ -2055,10 +2014,8 @@ getname: } if (tp->tim_flags & COTS) tp->tim_flags |= CONNWAIT; -/* ONC_PLUS EXTRACT END */ if (auditing) audit_sock(T_CONN_REQ, q, mp, TIMOD_ID); -/* ONC_PLUS EXTRACT START */ putnext(q, mp); break; } @@ -2119,7 +2076,6 @@ getname: break; } -/* ONC_PLUS EXTRACT END */ case T_DISCON_REQ: { struct T_discon_req *disp; struct T_conn_ind *conp; @@ -2175,7 +2131,6 @@ getname: */ putnext(q, mp); break; -/* ONC_PLUS EXTRACT START */ } break; case M_FLUSH: @@ -2446,7 +2401,6 @@ ti_doname( return (ret); } -/* ONC_PLUS EXTRACT END */ /* * Fill in the address of a connectionless data packet if a connect @@ -2580,7 +2534,6 @@ tim_findlink(t_uscalar_t id) return (tp); } -/* ONC_PLUS EXTRACT START */ static void tim_recover(queue_t *q, mblk_t *mp, t_scalar_t size) { @@ -2691,7 +2644,6 @@ ti_expind_on_rdqueues(queue_t *rq) return (0); /* no expdata on read queues */ } -/* ONC_PLUS EXTRACT END */ static void tim_tcap_timer(void *q_ptr) { diff --git a/usr/src/uts/common/os/flock.c b/usr/src/uts/common/os/flock.c index da81003d1c..4cb6ea8d82 100644 --- a/usr/src/uts/common/os/flock.c +++ b/usr/src/uts/common/os/flock.c @@ -18,7 +18,6 @@ * * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. @@ -28,8 +27,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/flock_impl.h> #include <sys/vfs.h> #include <sys/t_lock.h> /* for <sys/callb.h> */ @@ -609,7 +606,6 @@ flk_add_callback(flk_callback_t *newcb, cblist->cb_prev->cb_next = newcb; cblist->cb_prev = newcb; } -/* ONC_PLUS EXTRACT END */ /* * Initialize the flk_edge_cache data structure and create the @@ -984,7 +980,6 @@ block: } } -/* ONC_PLUS EXTRACT START */ /* * The actual execution of the request in the simple case is only to * insert the 'request' in the list of active locks if it is not an @@ -1043,7 +1038,6 @@ flk_execute_request(lock_descriptor_t *request) return (0); } -/* ONC_PLUS EXTRACT END */ /* * 'request' is blocked by some one therefore we put it into sleep queue. @@ -2243,7 +2237,6 @@ done: return (result); } -/* ONC_PLUS EXTRACT START */ /* * Determine whether there are any locks for the given vnode with a remote * sysid. Returns zero if not, non-zero if there are. @@ -2614,7 +2607,6 @@ cleanlocks(vnode_t *vp, pid_t pid, int sysid) CHECK_OWNER_LOCKS(gp, pid, sysid, vp); mutex_exit(&gp->gp_mutex); } -/* ONC_PLUS EXTRACT END */ /* @@ -2653,7 +2645,6 @@ chklock( return (error); } -/* ONC_PLUS EXTRACT START */ /* * convoff - converts the given data (start, whence) to the * given whence. @@ -2706,7 +2697,6 @@ convoff(vp, lckdat, whence, offset) lckdat->l_whence = (short)whence; return (0); } -/* ONC_PLUS EXTRACT END */ /* proc_graph function definitions */ @@ -3070,7 +3060,6 @@ add: mutex_exit(&flock_lock); } -/* ONC_PLUS EXTRACT START */ /* * Set the control status for lock manager requests. * @@ -3692,7 +3681,6 @@ unlock_lockmgr_granted(struct flock_globals *fg) mutex_exit(&gp->gp_mutex); } } -/* ONC_PLUS EXTRACT END */ /* @@ -3715,7 +3703,6 @@ wait_for_lock(lock_descriptor_t *request) } } -/* ONC_PLUS EXTRACT START */ /* * Create an flock structure from the existing lock information * @@ -3870,7 +3857,6 @@ report_blocker(lock_descriptor_t *blocker, lock_descriptor_t *request) } } } -/* ONC_PLUS EXTRACT END */ /* * PSARC case 1997/292 diff --git a/usr/src/uts/common/os/sig.c b/usr/src/uts/common/os/sig.c index 4bad31d2cb..d3ce92fe24 100644 --- a/usr/src/uts/common/os/sig.c +++ b/usr/src/uts/common/os/sig.c @@ -2227,7 +2227,6 @@ sigcheck(proc_t *p, kthread_t *t) #endif } -/* ONC_PLUS EXTRACT START */ void sigintr(k_sigset_t *smask, int intable) { @@ -2304,7 +2303,6 @@ sigintr(k_sigset_t *smask, int intable) lwp->lwp_nostop++; } -/* ONC_PLUS EXTRACT END */ void sigunintr(k_sigset_t *smask) diff --git a/usr/src/uts/common/os/swapgeneric.c b/usr/src/uts/common/os/swapgeneric.c index 18ce39949a..bfb6ccc05e 100644 --- a/usr/src/uts/common/os/swapgeneric.c +++ b/usr/src/uts/common/os/swapgeneric.c @@ -18,11 +18,9 @@ * * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ /* * Copyright (c) 1982, 2010, Oracle and/or its affiliates. All rights reserved. */ -/* ONC_PLUS EXTRACT END */ /* * Configure root, swap and dump devices. @@ -326,7 +324,6 @@ preload_module(struct sysparam *sysp, void *p) return (0); } -/* ONC_PLUS EXTRACT START */ /* * We want to load all the modules needed to mount the root filesystem, * so that when we start the ball rolling in 'getrootdev', every module @@ -340,7 +337,6 @@ loadrootmodules(void) char *this; char *name; int err; -/* ONC_PLUS EXTRACT END */ int i, proplen; extern char *impl_module_list[]; extern char *platform_module_list[]; @@ -483,7 +479,6 @@ loop: BMDPRINTF(("loadrootmodules: preload_module\n")); (void) mod_sysctl_type(MOD_FORCELOAD, preload_module, NULL); -/* ONC_PLUS EXTRACT START */ /* * If we booted otw then load in the plumbing * routine now while we still can. If we didn't @@ -582,7 +577,6 @@ out: return (err); } -/* ONC_PLUS EXTRACT END */ static int get_bootpath_prop(char *bootpath) diff --git a/usr/src/uts/common/os/sysent.c b/usr/src/uts/common/os/sysent.c index bf62a79268..e3965f7d82 100644 --- a/usr/src/uts/common/os/sysent.c +++ b/usr/src/uts/common/os/sysent.c @@ -19,8 +19,6 @@ * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ - /* * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. @@ -30,8 +28,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -/* ONC_PLUS EXTRACT END */ - #include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> @@ -53,7 +49,6 @@ struct hrtsysa; struct mmaplf32a; -/* ONC_PLUS EXTRACT START */ /* * This table is the switch used to transfer to the appropriate * routine for processing a system call. Each row contains the @@ -61,7 +56,6 @@ struct mmaplf32a; * in trap.c whether a setjmp() is not necessary, and a pointer * to the routine. */ -/* ONC_PLUS EXTRACT END */ int access(char *, int); int alarm(int); @@ -422,7 +416,6 @@ typedef int64_t (*llfcn_t)(); /* for casting one-word returns */ */ #define SYSENT_LOADABLE() \ { 0, SE_LOADABLE, (int (*)())nosys, NULL, loadable_syscall } -/* ONC_PLUS EXTRACT END */ /* * Initialization macro for loadable 32-bit compatibility system calls. @@ -433,13 +426,11 @@ typedef int64_t (*llfcn_t)(); /* for casting one-word returns */ struct sysent nosys_ent = SYSENT_NOSYS(); -/* ONC_PLUS EXTRACT START */ /* * Native sysent table. */ struct sysent sysent[NSYSCALL] = { -/* ONC_PLUS EXTRACT END */ /* 0 */ IF_LP64( SYSENT_NOSYS(), SYSENT_C("indir", indir, 1)), @@ -564,9 +555,7 @@ struct sysent sysent[NSYSCALL] = /* 103 */ SYSENT_CI("statvfs", statvfs, 2), /* 104 */ SYSENT_CI("fstatvfs", fstatvfs, 2), /* 105 */ SYSENT_CI("getloadavg", getloadavg, 2), -/* ONC_PLUS EXTRACT START */ /* 106 */ SYSENT_LOADABLE(), /* nfssys */ -/* ONC_PLUS EXTRACT END */ /* 107 */ SYSENT_CI("waitsys", waitsys, 4), /* 108 */ SYSENT_CI("sigsendset", sigsendsys, 2), /* 109 */ IF_x86( @@ -765,9 +754,7 @@ struct sysent sysent[NSYSCALL] = /* 253 */ SYSENT_CI("cladm", cladm, 3), /* 254 */ SYSENT_CI("uucopy", uucopy, 3), /* 255 */ SYSENT_CI("umount2", umount2, 2) -/* ONC_PLUS EXTRACT START */ }; -/* ONC_PLUS EXTRACT END */ #ifdef _SYSCALL32_IMPL @@ -821,14 +808,12 @@ extern ssize_t sendto32(int32_t, caddr32_t, size32_t, int32_t, caddr32_t, extern int privsys32(int, priv_op_t, priv_ptype_t, caddr32_t, size32_t, int); extern int ucredsys32(int, int, caddr32_t); -/* ONC_PLUS EXTRACT START */ /* * sysent table for ILP32 processes running on * a LP64 kernel. */ struct sysent sysent32[NSYSCALL] = { -/* ONC_PLUS EXTRACT END */ /* 0 */ SYSENT_C("indir", indir, 1), /* 1 */ SYSENT_CI("exit", (int (*)())rexit, 1), /* 2 */ SYSENT_LOADABLE32(), /* (was forkall) */ @@ -937,9 +922,7 @@ struct sysent sysent32[NSYSCALL] = /* 103 */ SYSENT_CI("statvfs", statvfs32, 2), /* 104 */ SYSENT_CI("fstatvfs", fstatvfs32, 2), /* 105 */ SYSENT_CI("getloadavg", getloadavg, 2), -/* ONC_PLUS EXTRACT START */ /* 106 */ SYSENT_LOADABLE32(), /* nfssys */ -/* ONC_PLUS EXTRACT END */ /* 107 */ SYSENT_CI("waitsys", waitsys32, 4), /* 108 */ SYSENT_CI("sigsendset", sigsendsys, 2), /* 109 */ IF_x86( @@ -1096,9 +1079,7 @@ struct sysent sysent32[NSYSCALL] = /* 253 */ SYSENT_CI("cladm", cladm, 3), /* 254 */ SYSENT_CI("uucopy", uucopy, 3), /* 255 */ SYSENT_CI("umount2", umount2, 2) -/* ONC_PLUS EXTRACT START */ }; -/* ONC_PLUS EXTRACT END */ #endif /* _SYSCALL32_IMPL */ /* diff --git a/usr/src/uts/common/rpc/Makefile b/usr/src/uts/common/rpc/Makefile index 7f2941ab73..2c5ed640b0 100644 --- a/usr/src/uts/common/rpc/Makefile +++ b/usr/src/uts/common/rpc/Makefile @@ -21,8 +21,6 @@ # # -# ident "%Z%%M% %I% %E% SMI" -# # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -103,21 +101,6 @@ key_prot.h: key_prot.x pmap_prot.h: pmap_prot.x $(RPCGEN) -h pmap_prot.x > $@ -# EXPORT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) Makefile+ sec_gss/rpcsec_gss_misc.c+ - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < sec_gss/rpcsec_gss_misc.c > sec_gss/rpcsec_gss_misc.c+ - $(MV) sec_gss/rpcsec_gss_misc.c+ sec_gss/rpcsec_gss_misc.c - $(CHMOD) 444 Makefile sec_gss/rpcsec_gss_misc.c - -# EXPORT DELETE END - rpc_sztypes.h: rpc_sztypes.x $(RPCGEN) -C -h rpc_sztypes.x > $@ diff --git a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c index 4e23daca68..76e6ea1c3e 100644 --- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c +++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c @@ -145,9 +145,7 @@ __rpc_gss_wrap_data(service, qop, context, seq_num, out_xdrs, gss_buffer_desc in_buf, out_buf; XDR temp_xdrs; char *temp_data; -/* EXPORT DELETE START */ bool_t conf_state; -/* EXPORT DELETE END */ bool_t ret = FALSE; int size; @@ -185,7 +183,6 @@ __rpc_gss_wrap_data(service, qop, context, seq_num, out_xdrs, switch (service) { case rpc_gss_svc_privacy: -/* EXPORT DELETE START */ if ((major = kgss_seal(&minor, context, TRUE, qop, &in_buf, &conf_state, &out_buf)) != GSS_S_COMPLETE) { RPCGSS_LOG1(1, "rpc_gss_wrap: kgss_seal failed." @@ -194,11 +191,8 @@ __rpc_gss_wrap_data(service, qop, context, seq_num, out_xdrs, } in_buf.length = 0; /* in_buf not needed */ if (!conf_state) -/* EXPORT DELETE END */ goto fail; -/* EXPORT DELETE START */ break; -/* EXPORT DELETE END */ case rpc_gss_svc_integrity: if ((major = kgss_sign(&minor, context, qop, &in_buf, &out_buf)) != GSS_S_COMPLETE) { @@ -264,10 +258,8 @@ __rpc_gss_unwrap_data(service, context, seq_num, qop_check, in_xdrs, if (service == rpc_gss_svc_privacy) { major = GSS_S_FAILURE; -/* EXPORT DELETE START */ major = kgss_unseal(&minor, context, &in_buf, &out_buf, &conf, &qop); -/* EXPORT DELETE END */ kmem_free(in_buf.value, in_buf.length); if (major != GSS_S_COMPLETE) { RPCGSS_LOG1(1, "rpc_gss_unwrap: kgss_unseal failed." diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index 271682bc67..0375409cb3 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -1382,16 +1382,3 @@ clobber: clean check: $(CHECKHDRS) FRC: - -# EXPORT DELETE START -EXPORT_SRC: - $(RM) wanboot_impl.h+ Makefile+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < wanboot_impl.h > wanboot_impl.h+ - $(MV) wanboot_impl.h+ wanboot_impl.h - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(RM) Makefile - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile wanboot_impl.h -# EXPORT DELETE END diff --git a/usr/src/uts/common/sys/wanboot_impl.h b/usr/src/uts/common/sys/wanboot_impl.h index 6801c7ac36..b953593fa1 100644 --- a/usr/src/uts/common/sys/wanboot_impl.h +++ b/usr/src/uts/common/sys/wanboot_impl.h @@ -27,14 +27,10 @@ #ifndef _SYS_WANBOOT_IMPL_H #define _SYS_WANBOOT_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> -/* EXPORT DELETE START */ #include <aes.h> #include <des3.h> #include <hmac_sha1.h> -/* EXPORT DELETE END */ #ifdef __cplusplus extern "C" { @@ -55,29 +51,23 @@ extern "C" { #define WANBOOT_MAXKEYLEN 1024 /* sized for RSA */ -/* EXPORT DELETE START */ #define WANBOOT_MAXBLOCKLEN AES_BLOCK_SIZE #define WANBOOT_HMAC_KEY_SIZE 20 /* size of key we use for HMAC SHA-1 */ -/* EXPORT DELETE END */ struct wankeyio { char wk_keyname[WANBOOT_MAXKEYNAMELEN]; uint_t wk_keysize; union { -/* EXPORT DELETE START */ char hmac_sha1_key[WANBOOT_HMAC_KEY_SIZE]; char des3key[DES3_KEY_SIZE]; char aeskey[AES_128_KEY_SIZE]; -/* EXPORT DELETE END */ char key[WANBOOT_MAXKEYLEN]; } wk_u; }; -/* EXPORT DELETE START */ #define wk_hmac_sha1_key wk_u.hmac_sha1_key #define wk_3des_key wk_u.3des_key #define wk_aes_key wk_u.aeskey -/* EXPORT DELETE END */ #define WANBOOT_SETKEY (('W' << 24) | ('A' << 16) | ('N' << 8) | 0) diff --git a/usr/src/uts/common/syscall/fcntl.c b/usr/src/uts/common/syscall/fcntl.c index cc0d7858d1..7421957235 100644 --- a/usr/src/uts/common/syscall/fcntl.c +++ b/usr/src/uts/common/syscall/fcntl.c @@ -19,7 +19,6 @@ * CDDL HEADER END */ -/* ONC_PLUS EXTRACT START */ /* * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. @@ -34,8 +33,6 @@ */ -/* ONC_PLUS EXTRACT END */ - #include <sys/param.h> #include <sys/isa_defs.h> #include <sys/types.h> @@ -43,9 +40,7 @@ #include <sys/systm.h> #include <sys/errno.h> #include <sys/fcntl.h> -/* ONC_PLUS EXTRACT START */ #include <sys/flock.h> -/* ONC_PLUS EXTRACT END */ #include <sys/vnode.h> #include <sys/file.h> #include <sys/mode.h> @@ -58,7 +53,6 @@ #include <sys/cmn_err.h> -/* ONC_PLUS EXTRACT START */ static int flock_check(vnode_t *, flock64_t *, offset_t, offset_t); static int flock_get_start(vnode_t *, flock64_t *, offset_t, u_offset_t *); static void fd_too_big(proc_t *); @@ -150,8 +144,6 @@ fcntl(int fdes, int cmd, intptr_t arg) iarg = (int)arg; switch (cmd) { -/* ONC_PLUS EXTRACT END */ - case F_DUPFD: case F_DUPFD_CLOEXEC: p = curproc; @@ -275,7 +267,6 @@ fcntl(int fdes, int cmd, intptr_t arg) offset = fp->f_offset; switch (cmd) { -/* ONC_PLUS EXTRACT START */ /* * The file system and vnode layers understand and implement * locking with flock64 structures. So here once we pass through @@ -450,7 +441,6 @@ fcntl(int fdes, int cmd, intptr_t arg) #endif } break; -/* ONC_PLUS EXTRACT END */ case F_CHKFL: /* @@ -597,7 +587,6 @@ fcntl(int fdes, int cmd, intptr_t arg) break; #if !defined(_LP64) || defined(_SYSCALL32_IMPL) -/* ONC_PLUS EXTRACT START */ case F_GETLK64: case F_SETLK64: case F_SETLKW64: @@ -680,10 +669,8 @@ fcntl(int fdes, int cmd, intptr_t arg) error = EFAULT; } break; -/* ONC_PLUS EXTRACT END */ #endif /* !defined(_LP64) || defined(_SYSCALL32_IMPL) */ -/* ONC_PLUS EXTRACT START */ case F_SHARE: case F_SHARE_NBMAND: case F_UNSHARE: @@ -708,7 +695,6 @@ fcntl(int fdes, int cmd, intptr_t arg) shr.s_own_len = sizeof (shr_own); shr.s_owner = (caddr_t)&shr_own; error = VOP_SHRLOCK(vp, cmd, &shr, flag, fp->f_cred, NULL); -/* ONC_PLUS EXTRACT END */ break; default: @@ -727,7 +713,6 @@ out: return (retval); } -/* ONC_PLUS EXTRACT START */ int flock_check(vnode_t *vp, flock64_t *flp, offset_t offset, offset_t max) { @@ -839,4 +824,3 @@ fd_too_big(proc_t *p) p->p_rctls, p, RCA_SAFE); mutex_exit(&p->p_lock); } -/* ONC_PLUS EXTRACT END */ |