diff options
Diffstat (limited to 'usr/src/lib')
52 files changed, 7 insertions, 1137 deletions
diff --git a/usr/src/lib/crypt_modules/bsdbf/Makefile b/usr/src/lib/crypt_modules/bsdbf/Makefile index 6eb0c845ec..f5ecab1c6c 100644 --- a/usr/src/lib/crypt_modules/bsdbf/Makefile +++ b/usr/src/lib/crypt_modules/bsdbf/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include $(SRC)/lib/Makefile.lib @@ -50,17 +48,3 @@ $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: - -# EXPORT DELETE START -CRYPT_SRC: EXPORT_SRC -EXPORT_SRC: - $(RM) Makefile+ blowfish.c+ - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < blowfish.c > blowfish.c+ - $(MV) blowfish.c+ blowfish.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile blowfish.c - -# EXPORT DELETE END diff --git a/usr/src/lib/crypt_modules/bsdbf/blowfish.c b/usr/src/lib/crypt_modules/bsdbf/blowfish.c index 460da7ac2a..1799561fe1 100644 --- a/usr/src/lib/crypt_modules/bsdbf/blowfish.c +++ b/usr/src/lib/crypt_modules/bsdbf/blowfish.c @@ -9,8 +9,6 @@ * been made. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* $OpenBSD: blowfish.c,v 1.16 2002/02/19 19:39:36 millert Exp $ */ /* * Blowfish block cipher for OpenBSD @@ -82,7 +80,6 @@ Blowfish_encipher(c, xl, xr) uint32_t *xl; uint32_t *xr; { -/* CRYPT DELETE START */ uint32_t Xl; uint32_t Xr; uint32_t *s = c->S[0]; @@ -103,7 +100,6 @@ Blowfish_encipher(c, xl, xr) *xl = Xr ^ p[17]; *xr = Xl; -/* CRYPT DELETE END */ } void @@ -112,7 +108,6 @@ Blowfish_decipher(c, xl, xr) uint32_t *xl; uint32_t *xr; { -/* CRYPT DELETE START */ uint32_t Xl; uint32_t Xr; uint32_t *s = c->S[0]; @@ -133,15 +128,12 @@ Blowfish_decipher(c, xl, xr) *xl = Xr ^ p[0]; *xr = Xl; -/* CRYPT DELETE END */ } void Blowfish_initstate(c) blf_ctx *c; { -/* CRYPT DELETE START */ - /* P-box and S-box tables initialized with digits of Pi */ const blf_ctx initstate = @@ -417,8 +409,6 @@ Blowfish_initstate(c) } }; *c = initstate; - -/* CRYPT DELETE END */ } uint32_t @@ -429,7 +419,6 @@ Blowfish_stream2word(const uint8_t *data, uint16_t databytes, uint16_t *current) uint32_t temp; temp = 0x00000000; -/* CRYPT DELETE START */ j = *current; for (i = 0; i < 4; i++, j++) { @@ -439,14 +428,12 @@ Blowfish_stream2word(const uint8_t *data, uint16_t databytes, uint16_t *current) } *current = j; -/* CRYPT DELETE END */ return temp; } void Blowfish_expand0state(blf_ctx *c, const uint8_t *key, uint16_t keybytes) { -/* CRYPT DELETE START */ uint16_t i; uint16_t j; uint16_t k; @@ -479,7 +466,6 @@ Blowfish_expand0state(blf_ctx *c, const uint8_t *key, uint16_t keybytes) c->S[i][k + 1] = datar; } } -/* CRYPT DELETE END */ } @@ -487,7 +473,6 @@ void Blowfish_expandstate(blf_ctx *c, const uint8_t *data, uint16_t databytes, const uint8_t *key, uint16_t keybytes) { -/* CRYPT DELETE START */ uint16_t i; uint16_t j; uint16_t k; @@ -524,26 +509,21 @@ Blowfish_expandstate(blf_ctx *c, const uint8_t *data, uint16_t databytes, c->S[i][k + 1] = datar; } } - -/* CRYPT DELETE END */ } void blf_key(blf_ctx *c, const uint8_t *k, uint16_t len) { -/* CRYPT DELETE START */ /* Initialize S-boxes and subkeys with Pi */ Blowfish_initstate(c); /* Transform S-boxes and subkeys with key */ Blowfish_expand0state(c, k, len); -/* CRYPT DELETE END */ } void blf_enc(blf_ctx *c, uint32_t *data, uint16_t blocks) { -/* CRYPT DELETE START */ uint32_t *d; uint16_t i; @@ -552,13 +532,11 @@ blf_enc(blf_ctx *c, uint32_t *data, uint16_t blocks) Blowfish_encipher(c, d, d + 1); d += 2; } -/* CRYPT DELETE END */ } void blf_dec(blf_ctx *c, uint32_t *data, uint16_t blocks) { -/* CRYPT DELETE START */ uint32_t *d; uint16_t i; @@ -567,13 +545,11 @@ blf_dec(blf_ctx *c, uint32_t *data, uint16_t blocks) Blowfish_decipher(c, d, d + 1); d += 2; } -/* CRYPT DELETE END */ } void blf_ecb_encrypt(blf_ctx *c, uint8_t *data, uint32_t len) { -/* CRYPT DELETE START */ uint32_t l, r; uint32_t i; @@ -591,13 +567,11 @@ blf_ecb_encrypt(blf_ctx *c, uint8_t *data, uint32_t len) data[7] = r & 0xff; data += 8; } -/* CRYPT DELETE END */ } void blf_ecb_decrypt(blf_ctx *c, uint8_t *data, uint32_t len) { -/* CRYPT DELETE START */ uint32_t l, r; uint32_t i; @@ -615,13 +589,11 @@ blf_ecb_decrypt(blf_ctx *c, uint8_t *data, uint32_t len) data[7] = r & 0xff; data += 8; } -/* CRYPT DELETE END */ } void blf_cbc_encrypt(blf_ctx *c, uint8_t *iv, uint8_t *data, uint32_t len) { -/* CRYPT DELETE START */ uint32_t l, r; uint32_t i, j; @@ -642,13 +614,11 @@ blf_cbc_encrypt(blf_ctx *c, uint8_t *iv, uint8_t *data, uint32_t len) iv = data; data += 8; } -/* CRYPT DELETE END */ } void blf_cbc_decrypt(blf_ctx *c, uint8_t *iva, uint8_t *data, uint32_t len) { -/* CRYPT DELETE START */ uint32_t l, r; uint8_t *iv; uint32_t i, j; @@ -685,10 +655,8 @@ blf_cbc_decrypt(blf_ctx *c, uint8_t *iva, uint8_t *data, uint32_t len) data[7] = r & 0xff; for (j = 0; j < 8; j++) data[j] ^= iva[j]; -/* CRYPT DELETE END */ } -/* CRYPT DELETE START */ #if 0 void report(uint32_t data[], uint16_t len) @@ -732,4 +700,3 @@ main(void) report(data2, 2); } #endif -/* CRYPT DELETE END */ diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile index 8cbefdd330..8640e0d68c 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile @@ -72,46 +72,6 @@ mech/dhmech_prot.h: mech/dhmech_prot.x # include library targets include ../../../Makefile.targ -# 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.com+ mech/crypto.c+ mech/dhmech.c+ - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile.com > Makefile.com+ - $(MV) Makefile.com+ Makefile.com - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/crypto.c > mech/crypto.c+ - $(MV) mech/crypto.c+ mech/crypto.c - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/dhmech.c > mech/dhmech.c+ - $(MV) mech/dhmech.c+ mech/dhmech.c - $(CHMOD) 444 Makefile Makefile.com mech/crypto.c mech/dhmech.c - -# CRYPT DELETE START -CRYPT_SRC: - $(RM) Makefile+ Makefile.com+ mech/dhmech.c+ - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile \ - | $(SED) -e "/EXPORT DELETE/d" \ - > Makefile+ - $(MV) Makefile+ Makefile - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile.com \ - | $(SED) -e "/EXPORT DELETE/d" \ - > Makefile.com+ - $(MV) Makefile.com+ Makefile.com - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < mech/dhmech.c > mech/dhmech.c+ - $(MV) mech/dhmech.c+ mech/dhmech.c - $(CHMOD) 444 Makefile Makefile.com mech/dhmech.c - -# CRYPT DELETE END -# EXPORT DELETE END - _msg: $(MSGDOMAIN) $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) $(CP) $(POFILE) $(MSGDOMAIN) diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com index 7379a16129..5d73764785 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com @@ -65,8 +65,6 @@ LIBS = $(DYNLIB) LIBNAME = $(LIBRARY:%.a=%) MAPFILES = ../mapfile-vers -$(EXPORT_RELEASE_BUILD)MAPFILES = \ - $(CLOSED)/lib/gss_mechs/mech_dh/backend/mapfile-vers-export LDLIBS += -lgss -lnsl -lc diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/mech/crypto.c b/usr/src/lib/gss_mechs/mech_dh/backend/mech/crypto.c index b80e228f88..3bbc2ab4e6 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/mech/crypto.c +++ b/usr/src/lib/gss_mechs/mech_dh/backend/mech/crypto.c @@ -27,8 +27,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/note.h> #include "dh_gssapi.h" #include "crypto.h" @@ -81,8 +79,6 @@ cipher_pad(cipher_t c, unsigned int len) } -/* EXPORT DELETE START */ - /* * Des [en/de]crypt buffer, buf of length, len for each key provided using * an CBC initialization vector ivec. @@ -148,8 +144,6 @@ __desN_crypt(des_block keys[], int keynum, char *buf, unsigned int len, return (stat); } -/* EXPORT DELETE END */ - /* * DesN crypt packaged for use as a cipher entry @@ -158,7 +152,6 @@ static OM_uint32 __dh_desN_crypt(gss_buffer_t buf, dh_key_set_t keys, cipher_mode_t cipher_mode) { int stat = DESERR_BADPARAM; -/* EXPORT DELETE START */ int encrypt_flag = (cipher_mode == ENCIPHER); unsigned mode = (encrypt_flag ? DES_ENCRYPT : DES_DECRYPT) | DES_HW; des_block ivec; @@ -179,7 +172,6 @@ __dh_desN_crypt(gss_buffer_t buf, dh_key_set_t keys, cipher_mode_t cipher_mode) /* Do the encryption/decryption */ stat = __desN_crypt(keys->dh_key_set_val, keys->dh_key_set_len, (char *)buf->value, buf->length, mode, ivec.c); -/* EXPORT DELETE END */ if (DES_FAILED(stat)) return (DH_CIPHER_FAILURE); @@ -194,7 +186,6 @@ static OM_uint32 __dh_des_crypt(gss_buffer_t buf, dh_key_set_t keys, cipher_mode_t cipher_mode) { int stat = DESERR_BADPARAM; -/* EXPORT DELETE START */ int encrypt_flag = (cipher_mode == ENCIPHER); unsigned mode = (encrypt_flag ? DES_ENCRYPT : DES_DECRYPT) | DES_HW; des_block ivec; @@ -206,7 +197,6 @@ __dh_des_crypt(gss_buffer_t buf, dh_key_set_t keys, cipher_mode_t cipher_mode) memset(&ivec, 0, sizeof (ivec)); stat = cbc_crypt(keys->dh_key_set_val[0].c, (char *)buf->value, buf->length, mode, ivec.c); -/* EXPORT DELETE END */ if (DES_FAILED(stat)) return (DH_CIPHER_FAILURE); diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/mech/dhmech.c b/usr/src/lib/gss_mechs/mech_dh/backend/mech/dhmech.c index 6d526b92bf..708c870b74 100644 --- a/usr/src/lib/gss_mechs/mech_dh/backend/mech/dhmech.c +++ b/usr/src/lib/gss_mechs/mech_dh/backend/mech/dhmech.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "dh_gssapi.h" #include <stdlib.h> @@ -41,9 +39,7 @@ static struct gss_config dh_mechanism = { __dh_gss_release_cred, __dh_gss_init_sec_context, __dh_gss_accept_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ __dh_gss_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ __dh_gss_process_context_token, __dh_gss_delete_sec_context, __dh_gss_context_time, @@ -55,9 +51,7 @@ static struct gss_config dh_mechanism = { __dh_gss_release_name, __dh_gss_inquire_cred, NULL, /* Back ends don't implement this */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ __dh_gss_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ __dh_gss_export_sec_context, __dh_gss_import_sec_context, __dh_gss_inquire_cred_by_mech, @@ -68,27 +62,6 @@ static struct gss_config dh_mechanism = { __dh_pname_to_uid, NULL, /* __gss_userok */ __dh_gss_export_name, -/* 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 */ - __dh_gss_seal, - __dh_gss_unseal, -/* CRYPT DELETE START */ -#endif /* 0 */ -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ __dh_gss_sign, __dh_gss_verify, NULL, /* gss_store_cred() -- DH lacks this for now */ diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com index 608208d0e8..9662e7088f 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # This make file will build dh1024.so.1. This shared object @@ -60,8 +58,6 @@ LIBS = $(DYNLIB) LIBNAME = $(LIBRARY:%.a=%) MAPFILES = ../mapfile-vers -$(EXPORT_RELEASE_BUILD)MAPFILES = \ - $(CLOSED)/lib/gss_mechs/mech_dh/dh1024/mapfile-vers-export LDLIBS += -lnsl -lmp -lc diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com index 976aaba55f..7399619398 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # This make file will build dh192.so.1. This shared object @@ -60,8 +58,6 @@ LIBS = $(DYNLIB) LIBNAME = $(LIBRARY:%.a=%) MAPFILES = ../mapfile-vers -$(EXPORT_RELEASE_BUILD)MAPFILES = \ - $(CLOSED)/lib/gss_mechs/mech_dh/dh192/mapfile-vers-export LDLIBS += -lnsl -lmp -lc diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com index b5ec7ef595..482aaed39c 100644 --- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # This make file will build dh640.so.1. This shared object @@ -60,8 +58,6 @@ LIBS = $(DYNLIB) LIBNAME = $(LIBRARY:%.a=%) MAPFILES = ../mapfile-vers -$(EXPORT_RELEASE_BUILD)MAPFILES = \ - $(CLOSED)/lib/gss_mechs/mech_dh/dh640/mapfile-vers-export LDLIBS += -lnsl -lmp -lc diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile b/usr/src/lib/gss_mechs/mech_dummy/Makefile index 9f7e98c95f..a79f39443f 100644 --- a/usr/src/lib/gss_mechs/mech_dummy/Makefile +++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile @@ -76,34 +76,3 @@ $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: - - -# 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+ mech/dmech.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/dmech.c > mech/dmech.c+ - $(MV) mech/dmech.c+ mech/dmech.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile mech/dmech.c - -# CRYPT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -CRYPT_SRC: - $(RM) Makefile+ mech/dmech.c+ - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < mech/dmech.c > mech/dmech.c+ - $(MV) mech/dmech.c+ mech/dmech.c - sed -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile mech/dmech.c - -# CRYPT DELETE END -# EXPORT DELETE END - diff --git a/usr/src/lib/gss_mechs/mech_dummy/mech/dmech.c b/usr/src/lib/gss_mechs/mech_dummy/mech/dmech.c index 205c409c1b..9decae6c43 100644 --- a/usr/src/lib/gss_mechs/mech_dummy/mech/dmech.c +++ b/usr/src/lib/gss_mechs/mech_dummy/mech/dmech.c @@ -18,7 +18,6 @@ * * CDDL HEADER END */ -#pragma ident "%Z%%M% %I% %E% SMI" /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. @@ -30,7 +29,6 @@ * specified through dummy_mech.conf located in /etc. * */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ #ifndef lint #define dummy_gss_accept_sec_context \ dummy_867227349 @@ -87,7 +85,6 @@ #define dummy_pname_to_uid \ dummy_345475423 #endif -/* EXPORT DELETE END */ /* CRYPT DELETE END */ #include <stdio.h> #include <stdlib.h> @@ -129,9 +126,7 @@ static struct gss_config dummy_mechanism = dummy_gss_release_cred, dummy_gss_init_sec_context, dummy_gss_accept_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ dummy_gss_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ dummy_gss_process_context_token, dummy_gss_delete_sec_context, dummy_gss_context_time, @@ -143,9 +138,7 @@ static struct gss_config dummy_mechanism = dummy_gss_release_name, dummy_gss_inquire_cred, dummy_gss_add_cred, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ dummy_gss_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ dummy_gss_export_sec_context, dummy_gss_import_sec_context, dummy_gss_inquire_cred_by_mech, @@ -156,16 +149,6 @@ static struct gss_config dummy_mechanism = dummy_pname_to_uid, NULL, /* __gss_userok */ NULL, /* _export name */ -/* 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, NULL, /* _store_cred */ diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile b/usr/src/lib/gss_mechs/mech_krb5/Makefile index bd2a930136..6d5fa74ac8 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # This make file will build mech_krb5.so.1. This shared object @@ -92,66 +90,6 @@ $(SUBDIRS): FRC FRC: -# 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.mech_krb5+\ - crypto/des/afsstring2key.c+ \ - crypto/des/string2key.c+ \ - mech/krb5_gss_glue.c+ - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < crypto/des/afsstring2key.c > crypto/des/afsstring2key.c+ - $(MV) crypto/des/afsstring2key.c+ crypto/des/afsstring2key.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < crypto/des/string2key.c > crypto/des/string2key.c+ - $(MV) crypto/des/string2key.c+ crypto/des/string2key.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/krb5_gss_glue.c > mech/krb5_gss_glue.c+ - $(MV) mech/krb5_gss_glue.c+ mech/krb5_gss_glue.c - - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile.mech_krb5 > Makefile.mech_krb5+ - $(MV) Makefile.mech_krb5+ Makefile.mech_krb5 - - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - - $(CHMOD) 444 Makefile Makefile.mech_krb5 \ - crypto/des/afsstring2key.c \ - crypto/des/string2key.c \ - mech/krb5_gss_glue.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+ mech/krb5_gss_glue.c+ - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - > mech/krb5_gss_glue.c+ < mech/krb5_gss_glue.c - $(MV) mech/krb5_gss_glue.c+ mech/krb5_gss_glue.c - - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile \ - | $(SED) -e "/EXPORT DELETE/d" \ - > Makefile+ - $(MV) Makefile+ Makefile - - $(CHMOD) 444 mech/krb5_gss_glue.c Makefile - -# CRYPT DELETE END -# EXPORT DELETE END - - - -FRC: - _msg: $(MSGDOMAIN) .WAIT $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) $(CP) $(POFILE) $(MSGDOMAIN) diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com index d1c68cea64..05961e3a1e 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com @@ -261,12 +261,7 @@ CERRWARN += -_gcc=-Wno-unused-value CERRWARN += -_gcc=-Wno-empty-body CERRWARN += -_gcc=-Wno-address -MAPFILE_EXPORT = ../mapfile-vers-clean -$(EXPORT_RELEASE_BUILD)MAPFILE_EXPORT = \ - $(CLOSED)/lib/gss_mechs/mech_krb5/mapfile-vers-export -MAPFILES = ../mapfile-vers $(MAPFILE_EXPORT) - -$(EXPORT_RELEASE_BUILD)include $(CLOSED)/lib/gss_mechs/mech_krb5/Makefile.export +MAPFILES = ../mapfile-vers #CPPFLAGS += -D_REENTRANT $(PICS) := CFLAGS += $(XFFLAG) diff --git a/usr/src/lib/gss_mechs/mech_krb5/crypto/des/afsstring2key.c b/usr/src/lib/gss_mechs/mech_krb5/crypto/des/afsstring2key.c index a0c7847296..38a50d9e68 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/crypto/des/afsstring2key.c +++ b/usr/src/lib/gss_mechs/mech_krb5/crypto/des/afsstring2key.c @@ -81,7 +81,6 @@ mit_afs_string_to_key (krb5_context context, { /* Solaris Kerberos */ krb5_error_code retval = KRB5_PROG_ETYPE_NOSUPP; -/* EXPORT DELETE START */ /* totally different approach from MIT string2key. */ /* much of the work has already been done by the only caller which is mit_des_string_to_key; in particular, *keyblock is already @@ -185,7 +184,6 @@ mit_afs_string_to_key (krb5_context context, krb5_xfree(salt->data); #endif -/* EXPORT DELETE END */ return retval; } @@ -216,8 +214,6 @@ mit_afs_string_to_key (krb5_context context, * netatalk@terminator.cc.umich.edu */ -/* EXPORT DELETE START */ - static void krb5_afs_crypt_setkey (char*, char*, char(*)[48]); static void krb5_afs_encrypt (char*,char*,char (*)[48]); @@ -602,4 +598,3 @@ static void krb5_afs_encrypt(char *block, char *E, char (*KS)[48]) for (j=0; j<64; j++) block[j] = L[FP[j]-1]; } -/* EXPORT DELETE END */ diff --git a/usr/src/lib/gss_mechs/mech_krb5/crypto/des/string2key.c b/usr/src/lib/gss_mechs/mech_krb5/crypto/des/string2key.c index f8a9c1611f..8a33c280fa 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/crypto/des/string2key.c +++ b/usr/src/lib/gss_mechs/mech_krb5/crypto/des/string2key.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * lib/crypto/des/string2key.c * @@ -54,7 +52,6 @@ mit_des_string_to_key_int (krb5_context context, const krb5_data *salt) { krb5_error_code retval = KRB5_PROG_ETYPE_NOSUPP; -/* EXPORT DELETE START */ register char *str, *copystr; register krb5_octet *key; register unsigned temp; @@ -180,6 +177,5 @@ mit_des_string_to_key_int (krb5_context context, keyblock->hKey = CK_INVALID_HANDLE; } -/* EXPORT DELETE END */ return retval; } diff --git a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers index ad215009f3..50b3e46887 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers +++ b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers @@ -222,6 +222,7 @@ SYMBOL_VERSION SUNWprivate_1.1 { gsskrb5_extract_authz_data_from_sec_context; gss_krb5_ccache_name; gss_krb5_copy_ccache; + gss_mech_initialize; gss_mech_krb5; gss_mech_krb5_old; gss_mech_krb5_wrong; @@ -748,9 +749,11 @@ SYMBOL_VERSION SUNWprivate_1.1 { kwarn_add_warning; kwarn_del_warning; kv5m_error_table; + mit_afs_string_to_key; mit_des_check_key_parity; mit_des_fixup_key_parity; mit_des_is_weak_key; + mit_des_string_to_key_int; ovk_error_table; ovku_error_table; prof_error_table; diff --git a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean deleted file mode 100644 index e9f4619d47..0000000000 --- a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean +++ /dev/null @@ -1,46 +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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - -$mapfile_version 2 - -SYMBOL_VERSION SUNWprivate_1.1 { - global: - gss_mech_initialize; - mit_afs_string_to_key; - mit_des_string_to_key_int; -}; diff --git a/usr/src/lib/gss_mechs/mech_krb5/mech/krb5_gss_glue.c b/usr/src/lib/gss_mechs/mech_krb5/mech/krb5_gss_glue.c index 8bcac58782..b9fb65b390 100644 --- a/usr/src/lib/gss_mechs/mech_krb5/mech/krb5_gss_glue.c +++ b/usr/src/lib/gss_mechs/mech_krb5/mech/krb5_gss_glue.c @@ -115,7 +115,6 @@ static OM_uint32 k5glue_verify int* /* qop_state */ ); -/* EXPORT DELETE START */ static OM_uint32 k5glue_seal (void *, OM_uint32*, /* minor_status */ gss_ctx_id_t, /* context_handle */ @@ -134,7 +133,6 @@ static OM_uint32 k5glue_unseal int*, /* conf_state */ int* /* qop_state */ ); -/* EXPORT DELETE END */ static OM_uint32 k5glue_display_status (void *, OM_uint32*, /* minor_status */ @@ -409,9 +407,7 @@ static struct gss_config krb5_mechanism = { k5glue_release_cred, k5glue_init_sec_context, k5glue_accept_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_process_context_token, k5glue_delete_sec_context, k5glue_context_time, @@ -423,9 +419,7 @@ static struct gss_config krb5_mechanism = { k5glue_release_name, k5glue_inquire_cred, k5glue_add_cred, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_export_sec_context, k5glue_import_sec_context, k5glue_inquire_cred_by_mech, @@ -436,16 +430,6 @@ static struct gss_config krb5_mechanism = { k5glue_pname_to_uid, k5glue_userok, k5glue_export_name, -/* 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, k5glue_store_cred, @@ -462,9 +446,7 @@ static struct gss_config krb5_mechanism_old = { k5glue_release_cred, k5glue_init_sec_context, k5glue_accept_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_process_context_token, k5glue_delete_sec_context, k5glue_context_time, @@ -476,9 +458,7 @@ static struct gss_config krb5_mechanism_old = { k5glue_release_name, k5glue_inquire_cred, k5glue_add_cred, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_export_sec_context, k5glue_import_sec_context, k5glue_inquire_cred_by_mech, @@ -489,16 +469,6 @@ static struct gss_config krb5_mechanism_old = { k5glue_pname_to_uid, k5glue_userok, k5glue_export_name, -/* 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, k5glue_store_cred, @@ -515,9 +485,7 @@ static struct gss_config krb5_mechanism_wrong = { k5glue_release_cred, k5glue_init_sec_context, k5glue_accept_sec_context, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_unseal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_process_context_token, k5glue_delete_sec_context, k5glue_context_time, @@ -529,9 +497,7 @@ static struct gss_config krb5_mechanism_wrong = { k5glue_release_name, k5glue_inquire_cred, k5glue_add_cred, -/* EXPORT DELETE START */ /* CRYPT DELETE START */ k5glue_seal, -/* EXPORT DELETE END */ /* CRYPT DELETE END */ k5glue_export_sec_context, k5glue_import_sec_context, k5glue_inquire_cred_by_mech, @@ -542,16 +508,6 @@ static struct gss_config krb5_mechanism_wrong = { k5glue_pname_to_uid, k5glue_userok, k5glue_export_name, -/* 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, k5glue_store_cred, @@ -993,7 +949,6 @@ k5glue_release_oid_set(ctx, minor_status, set) } #endif -/* EXPORT DELETE START */ /* V1 only */ static OM_uint32 k5glue_seal(ctx, minor_status, context_handle, conf_req_flag, qop_req, @@ -1011,7 +966,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)); } -/* EXPORT DELETE END */ static OM_uint32 k5glue_sign(ctx, minor_status, context_handle, @@ -1087,7 +1041,6 @@ k5glue_test_oid_set_member(ctx, minor_status, member, set, present) } #endif -/* EXPORT DELETE START */ /* V1 only */ static OM_uint32 k5glue_unseal(ctx, minor_status, context_handle, input_message_buffer, @@ -1104,7 +1057,6 @@ k5glue_unseal(ctx, minor_status, context_handle, input_message_buffer, input_message_buffer, output_message_buffer, conf_state, qop_state)); } -/* EXPORT DELETE END */ #if 0 /* V2 */ diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile b/usr/src/lib/gss_mechs/mech_spnego/Makefile index c1ab5b64da..027c489ed5 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/Makefile +++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# # # This make file will build mech_spnego.so.1. This shared object @@ -53,32 +51,3 @@ $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) FRC: - -# 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+ mech/spnego_mech.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < mech/spnego_mech.c > mech/spnego_mech.c+ - $(MV) mech/spnego_mech.c+ mech/spnego_mech.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile mech/spnego_mech.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+ mech/spnego_mech.c+ - sed -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < mech/spnego_mech.c > mech/spnego_mech.c+ - $(MV) mech/spnego_mech.c+ mech/spnego_mech.c - sed -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile mech/spnego_mech.c - -# CRYPT DELETE END -# EXPORT DELETE END diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com index a8adb3afde..28c7aebfe4 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com +++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com @@ -41,10 +41,7 @@ ROOTLIBDIR = $(ROOT)/usr/lib/gss ROOTLIBDIR64 = $(ROOT)/usr/lib/$(MACH64)/gss SRCDIR = ../mech -MAPFILE_EXPORT = ../mapfile-vers-clean -$(EXPORT_RELEASE_BUILD)MAPFILE_EXPORT = \ - $(CLOSED)/lib/gss_mechs/mech_spnego/mapfile-vers-export -MAPFILES = ../mapfile-vers $(MAPFILE_EXPORT) +MAPFILES = ../mapfile-vers CPPFLAGS += -I$(SRC)/uts/common/gssapi/include $(DEBUG) -I$(SRC)/lib/gss_mechs/mech_krb5/include -I$(SRC)/uts/common/gssapi/mechs/krb5/include -I$(SRC)/lib/gss_mechs/mech_krb5/mech diff --git a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers index 98baa33346..9af90ce12b 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers +++ b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers @@ -40,6 +40,7 @@ $mapfile_version 2 SYMBOL_VERSION SUNWprivate { global: + gss_mech_initialize; spnego_gss_accept_sec_context; spnego_gss_acquire_cred; spnego_gss_delete_sec_context; diff --git a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean deleted file mode 100644 index 777c2c8d9a..0000000000 --- a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean +++ /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 (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# MAPFILE HEADER START -# -# WARNING: STOP NOW. DO NOT MODIFY THIS FILE. -# Object versioning must comply with the rules detailed in -# -# usr/src/lib/README.mapfiles -# -# You should not be making modifications here until you've read the most current -# copy of that file. If you need help, contact a gatekeeper for guidance. -# -# MAPFILE HEADER END -# - -$mapfile_version 2 - -SYMBOL_VERSION SUNWprivate { - global: - gss_mech_initialize; -}; diff --git a/usr/src/lib/gss_mechs/mech_spnego/mech/spnego_mech.c b/usr/src/lib/gss_mechs/mech_spnego/mech/spnego_mech.c index 472199adae..8faac2d3a1 100644 --- a/usr/src/lib/gss_mechs/mech_spnego/mech/spnego_mech.c +++ b/usr/src/lib/gss_mechs/mech_spnego/mech/spnego_mech.c @@ -242,9 +242,7 @@ static struct gss_config spnego_mechanism = #else NULL, #endif /* LEAN_CLIENT */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ NULL, /* unseal */ -/* EXPORT DELETE END */ /* CRYPT DELETE END */ NULL, /* gss_process_context_token */ glue_spnego_gss_delete_sec_context, /* gss_delete_sec_context */ glue_spnego_gss_context_time, @@ -256,9 +254,7 @@ static struct gss_config spnego_mechanism = glue_spnego_gss_release_name, NULL, /* gss_inquire_cred */ NULL, /* gss_add_cred */ -/* EXPORT DELETE START */ /* CRYPT DELETE START */ NULL, /* seal */ -/* EXPORT DELETE END */ /* CRYPT DELETE END */ #ifndef LEAN_CLIENT glue_spnego_gss_export_sec_context, /* gss_export_sec_context */ glue_spnego_gss_import_sec_context, /* gss_import_sec_context */ @@ -274,16 +270,6 @@ static struct gss_config spnego_mechanism = NULL, /* pname */ NULL, /* userok */ NULL, /* gss_export_name */ -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ -#if 0 -/* CRYPT DELETE END */ - NULL, /* seal */ - NULL, /* unseal */ -/* CRYPT DELETE START */ -#endif -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ NULL, /* sign */ NULL, /* verify */ NULL, /* gss_store_cred */ diff --git a/usr/src/lib/libcrypt/Makefile b/usr/src/lib/libcrypt/Makefile index 50b2067ac1..7e799cd36f 100644 --- a/usr/src/lib/libcrypt/Makefile +++ b/usr/src/lib/libcrypt/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -48,30 +46,3 @@ $(SUBDIRS): FRC FRC: include ../Makefile.targ - -# EXPORT DELETE START -EXPORT_SRC: - $(RM) common/des.c+ common/des_crypt.c+ common/des_soft.c+ \ - common/des_decrypt.c+ common/des_encrypt.c+ \ - Makefile+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" < \ - common/des.c > common/des.c+ - $(MV) common/des.c+ common/des.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" < \ - common/des_crypt.c > common/des_crypt.c+ - $(MV) common/des_crypt.c+ common/des_crypt.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" < \ - common/des_soft.c > common/des_soft.c+ - $(MV) common/des_soft.c+ common/des_soft.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" < \ - common/des_encrypt.c > common/des_encrypt.c+ - $(MV) common/des_encrypt.c+ common/des_encrypt.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" < \ - common/des_decrypt.c > common/des_decrypt.c+ - $(MV) common/des_decrypt.c+ common/des_decrypt.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile common/des.c common/des_crypt.c \ - common/des_soft.c common/des_encrypt.c common/des_decrypt.c -# EXPORT DELETE END diff --git a/usr/src/lib/libcrypt/common/des.c b/usr/src/lib/libcrypt/common/des.c index d7847e397b..4ef8e5c332 100644 --- a/usr/src/lib/libcrypt/common/des.c +++ b/usr/src/lib/libcrypt/common/des.c @@ -32,8 +32,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * DES encryption library routines */ @@ -99,15 +97,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); } @@ -119,18 +114,14 @@ int ecb_crypt(char *key, char *buf, size_t len, unsigned int mode) { int ret = 0; - -/* EXPORT DELETE START */ struct desparams dp; dp.des_mode = ECB; ret = common_crypt(key, buf, len, mode, &dp); -/* EXPORT DELETE END */ return (ret); } -/* EXPORT DELETE START */ /* * Common code to cbc_crypt() & ecb_crypt() */ @@ -182,4 +173,3 @@ software: } return (desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE); } -/* EXPORT DELETE END */ diff --git a/usr/src/lib/libcrypt/common/des_crypt.c b/usr/src/lib/libcrypt/common/des_crypt.c index d67058dcf0..14eead980b 100644 --- a/usr/src/lib/libcrypt/common/des_crypt.c +++ b/usr/src/lib/libcrypt/common/des_crypt.c @@ -27,8 +27,6 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _des_crypt = des_crypt #pragma weak _des_encrypt = des_encrypt #pragma weak _des_setkey = des_setkey @@ -42,7 +40,6 @@ #include <pthread.h> #include <sys/types.h> -/* EXPORT DELETE START */ /* * This program implements the * Proposed Federal Information Processing @@ -154,13 +151,9 @@ static char e2[] = { static mutex_t lock = DEFAULTMUTEX; -/* EXPORT DELETE END */ - - static void des_setkey_nolock(const char *key) { -/* EXPORT DELETE START */ int i, j, k; char t; @@ -204,20 +197,16 @@ des_setkey_nolock(const char *key) for (i = 0; i < 48; i++) E[i] = e2[i]; -/* EXPORT DELETE END */ } void des_setkey(const char *key) { -/* EXPORT DELETE START */ (void) mutex_lock(&lock); des_setkey_nolock(key); (void) mutex_unlock(&lock); -/* EXPORT DELETE END */ } -/* EXPORT DELETE START */ /* * The 8 selection functions. * For some reason, they give a 0-origin @@ -295,31 +284,24 @@ static char preS[48]; /* * The payoff: encrypt a block. */ -/* EXPORT DELETE END */ static void des_encrypt_nolock(char *block, int edflag) { -/* EXPORT DELETE START */ - if (edflag) (void) _des_decrypt1(block, L, IP, &L[32], preS, E, KS, S, f, tempL, P, FP); else (void) des_encrypt1(block, L, IP, &L[32], preS, E, KS, S, f, tempL, P, FP); - -/* EXPORT DELETE END */ } void des_encrypt(char *block, int edflag) { -/* EXPORT DELETE START */ (void) mutex_lock(&lock); des_encrypt_nolock(block, edflag); (void) mutex_unlock(&lock); -/* EXPORT DELETE END */ } @@ -347,7 +329,6 @@ _get_iobuf(thread_key_t *keyp, unsigned size) char * des_crypt(const char *pw, const char *salt) { -/* EXPORT DELETE START */ int i, j; char c, temp; char block[66]; @@ -406,10 +387,4 @@ des_crypt(const char *pw, const char *salt) iobuf[1] = iobuf[0]; (void) mutex_unlock(&lock); return (iobuf); -#if 0 -/* EXPORT DELETE END */ - return (0); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } diff --git a/usr/src/lib/libcrypt/common/des_decrypt.c b/usr/src/lib/libcrypt/common/des_decrypt.c index ac8fb8291f..978f047385 100644 --- a/usr/src/lib/libcrypt/common/des_decrypt.c +++ b/usr/src/lib/libcrypt/common/des_decrypt.c @@ -28,7 +28,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /*LINTLIBRARY*/ #include <sys/types.h> @@ -36,7 +35,6 @@ void _des_decrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, char KS[][48], char S[][64], char *f, char *tempL, char *P, char *FP) { -/* EXPORT DELETE START */ int i, ii; int t, j, k; char t2; @@ -115,5 +113,4 @@ _des_decrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, char */ for (j = 0; j < 64; j++) block[j] = L[FP[j]-1]; -/* EXPORT DELETE END */ } diff --git a/usr/src/lib/libcrypt/common/des_encrypt.c b/usr/src/lib/libcrypt/common/des_encrypt.c index 937b9c8a11..05a3ba56c7 100644 --- a/usr/src/lib/libcrypt/common/des_encrypt.c +++ b/usr/src/lib/libcrypt/common/des_encrypt.c @@ -27,8 +27,6 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _des_encrypt1 = des_encrypt1 #include <sys/types.h> @@ -37,7 +35,6 @@ void des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, char KS[][48], char S[][64], char *f, char *tempL, char *P, char *FP) { -/* EXPORT DELETE START */ int i; int t, j, k; char t2; @@ -115,5 +112,4 @@ des_encrypt1(char *block, char *L, char *IP, char *R, char *preS, char *E, */ for (j = 0; j < 64; j++) block[j] = L[FP[j]-1]; -/* EXPORT DELETE END */ } diff --git a/usr/src/lib/libcrypt/common/des_soft.c b/usr/src/lib/libcrypt/common/des_soft.c index eea97578b1..eb9902e57c 100644 --- a/usr/src/lib/libcrypt/common/des_soft.c +++ b/usr/src/lib/libcrypt/common/des_soft.c @@ -32,8 +32,6 @@ * under license from the Regents of the University of California. */ -#pragma 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 @@ -126,7 +124,6 @@ des_setparity(char *p) int __des_crypt(char *buf, unsigned int len, struct desparams *desp) { -/* EXPORT DELETE START */ short i; unsigned mode; unsigned dir; @@ -165,7 +162,6 @@ __des_crypt(char *buf, unsigned int len, struct desparams *desp) buf += 8; len -= 8; } -/* EXPORT DELETE END */ return (1); } @@ -177,7 +173,6 @@ __des_crypt(char *buf, unsigned int len, struct desparams *desp) static void des_setkey(uchar_t userkey[8], struct deskeydata *kd, unsigned int dir) { -/* EXPORT DELETE START */ long C, D; short i; @@ -257,7 +252,6 @@ des_setkey(uchar_t userkey[8], struct deskeydata *kd, unsigned int dir) } } -/* EXPORT DELETE END */ } @@ -272,7 +266,6 @@ des_setkey(uchar_t userkey[8], struct deskeydata *kd, unsigned int dir) static void des_encrypt(uchar_t *data, struct deskeydata *kd) { -/* EXPORT DELETE START */ chunk_t work1, work2; /* @@ -440,7 +433,5 @@ des_encrypt(uchar_t *data, struct deskeydata *kd) data[5] = work2.byte5; data[6] = work2.byte6; data[7] = work2.byte7; - -/* EXPORT DELETE END */ } #endif /* def CRYPT */ diff --git a/usr/src/lib/libgss/Makefile b/usr/src/lib/libgss/Makefile index e1ddcf1af3..73d2c91060 100644 --- a/usr/src/lib/libgss/Makefile +++ b/usr/src/lib/libgss/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -73,24 +71,4 @@ FRC: # include library targets include ../Makefile.targ -# 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+ g_seal.c+ g_unseal.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < g_seal.c > g_seal.c+ - $(MV) g_seal.c+ g_seal.c - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < g_unseal.c > g_unseal.c+ - $(MV) g_unseal.c+ g_unseal.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile g_seal.c g_unseal.c - -# EXPORT DELETE END - - include $(SRC)/Makefile.msg.targ diff --git a/usr/src/lib/libgss/g_seal.c b/usr/src/lib/libgss/g_seal.c index 2f51651755..49448b49fd 100644 --- a/usr/src/lib/libgss/g_seal.c +++ b/usr/src/lib/libgss/g_seal.c @@ -83,8 +83,6 @@ gss_buffer_t input_message_buffer; int * conf_state; gss_buffer_t output_message_buffer; { -/* EXPORT DELETE START */ - OM_uint32 status; gss_union_ctx_id_t ctx; gss_mechanism mech; @@ -122,7 +120,6 @@ gss_buffer_t output_message_buffer; return (status); } -/* EXPORT DELETE END */ return (GSS_S_BAD_MECH); } diff --git a/usr/src/lib/libgss/g_unseal.c b/usr/src/lib/libgss/g_unseal.c index 37eae7972f..f0110d1b5c 100644 --- a/usr/src/lib/libgss/g_unseal.c +++ b/usr/src/lib/libgss/g_unseal.c @@ -45,7 +45,6 @@ int * conf_state; int * qop_state; { -/* EXPORT DELETE START */ OM_uint32 status; gss_union_ctx_id_t ctx; gss_mechanism mech; @@ -97,8 +96,6 @@ int * qop_state; return (status); } -/* EXPORT DELETE END */ - return (GSS_S_BAD_MECH); } diff --git a/usr/src/lib/libldap5/sources/ldap/common/open.c b/usr/src/lib/libldap5/sources/ldap/common/open.c index ee59bf4c0a..c97685f223 100644 --- a/usr/src/lib/libldap5/sources/ldap/common/open.c +++ b/usr/src/lib/libldap5/sources/ldap/common/open.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * The contents of this file are subject to the Netscape Public @@ -401,11 +399,7 @@ ldap_version( LDAPVersion *ver ) ver->security_level = LDAP_SECURITY_NONE; #if defined(LINK_SSL) -#if defined(NS_DOMESTIC) ver->security_level = 128; -#elif defined(NSS_EXPORT) - ver->security_level = 40; -#endif #endif } diff --git a/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c b/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c index 09f3e893a5..8139b2a71a 100644 --- a/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c +++ b/usr/src/lib/libldap5/sources/ldap/ssldap/clientinit.c @@ -156,16 +156,7 @@ splitpath(char *string, char *dir, char *prefix, char *key) { static PRStatus local_SSLPLCY_Install(void) { - SECStatus s; - -#ifdef NS_DOMESTIC - s = NSS_SetDomesticPolicy(); -#elif NS_EXPORT - s = NSS_SetExportPolicy(); -#else - s = PR_FAILURE; -#endif - return s?PR_FAILURE:PR_SUCCESS; + return NSS_SetDomesticPolicy() ? PR_FAILURE : PR_SUCCESS; } @@ -472,20 +463,10 @@ ldapssl_clientauth_init( const char *certdbpath, void *certdbhandle, -#if defined(NS_DOMESTIC) - if (local_SSLPLCY_Install() == PR_FAILURE) { - mutex_unlock(&inited_mutex); - return( -1 ); - } -#elif(NS_EXPORT) if (local_SSLPLCY_Install() == PR_FAILURE) { mutex_unlock(&inited_mutex); return( -1 ); } -#else - mutex_unlock(&inited_mutex); - return( -1 ); -#endif inited = 1; mutex_unlock(&inited_mutex); @@ -576,20 +557,10 @@ ldapssl_advclientauth_init( return (rc); } -#if defined(NS_DOMESTIC) if (local_SSLPLCY_Install() == PR_FAILURE) { mutex_unlock(&inited_mutex); return( -1 ); } -#elif(NS_EXPORT) - if (local_SSLPLCY_Install() == PR_FAILURE) { - mutex_unlock(&inited_mutex); - return( -1 ); - } -#else - mutex_unlock(&inited_mutex); - return( -1 ); -#endif inited = 1; mutex_unlock(&inited_mutex); @@ -711,20 +682,10 @@ ldapssl_pkcs_init( const struct ldapssl_pkcs_fns *pfns ) return( rc ); } -#if defined(NS_DOMESTIC) if (local_SSLPLCY_Install() == PR_FAILURE) { mutex_unlock(&inited_mutex); return( -1 ); } -#elif(NS_EXPORT) - if (local_SSLPLCY_Install() == PR_FAILURE) { - mutex_unlock(&inited_mutex); - return( -1 ); - } -#else - mutex_unlock(&inited_mutex); - return( -1 ); -#endif inited = 1; diff --git a/usr/src/lib/libnsl/Makefile b/usr/src/lib/libnsl/Makefile index ed41c9d4e1..923f8dad40 100644 --- a/usr/src/lib/libnsl/Makefile +++ b/usr/src/lib/libnsl/Makefile @@ -132,38 +132,6 @@ nis/gen/nis_clnt.h: $(PROTOCOL_DIR)/nis.x $(PROTOCOL_DIR)/nis_object.x # include library targets include ../Makefile.targ -# EXPORT DELETE START -# CRYPT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) Makefile+ des/des_crypt.c+ des/des_soft.c+ key/xcrypt.c+ - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < des/des_crypt.c > des/des_crypt.c+ - $(MV) des/des_crypt.c+ des/des_crypt.c - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < des/des_soft.c > des/des_soft.c+ - $(MV) des/des_soft.c+ des/des_soft.c - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < key/xcrypt.c > key/xcrypt.c+ - $(MV) key/xcrypt.c+ key/xcrypt.c - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile des/des_crypt.c des/des_soft.c key/xcrypt.c - -CRYPT_SRC: - $(RM) Makefile+ - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile \ - | $(SED) -e "/EXPORT DELETE/d" \ - > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# CRYPT DELETE END -# EXPORT DELETE END - _msg: $(MSGDOMAIN) $(POFILE) $(RM) $(MSGDOMAIN)/$(POFILE) $(CP) $(POFILE) $(MSGDOMAIN) diff --git a/usr/src/lib/libnsl/des/des_crypt.c b/usr/src/lib/libnsl/des/des_crypt.c index 2863c9277b..3937b7d87c 100644 --- a/usr/src/lib/libnsl/des/des_crypt.c +++ b/usr/src/lib/libnsl/des/des_crypt.c @@ -33,8 +33,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * DES encryption library routines */ @@ -44,7 +42,6 @@ #include <fcntl.h> #include <sys/types.h> #include <rpc/des_crypt.h> -/* EXPORT DELETE START */ #ifdef sun #include <sys/ioctl.h> #include <sys/des.h> @@ -52,9 +49,7 @@ #else #include <des/des.h> #endif -/* EXPORT DELETE END */ #include <rpc/rpc.h> -/* EXPORT DELETE START */ extern int __des_crypt(char *, unsigned, struct desparams *); @@ -89,7 +84,6 @@ static int g_desfd = UNOPENED; *a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \ } \ } -/* EXPORT DELETE END */ /* * CBC mode encryption @@ -97,7 +91,6 @@ static int g_desfd = UNOPENED; int cbc_crypt(char *key, char *buf, size_t len, unsigned int mode, char *ivec) { -/* EXPORT DELETE START */ int err; struct desparams dp; @@ -106,12 +99,6 @@ cbc_crypt(char *key, char *buf, size_t len, unsigned int mode, char *ivec) err = common_crypt(key, buf, len, mode, &dp); COPY8(dp.des_ivec, ivec); return (err); -#if 0 -/* EXPORT DELETE END */ - return (DESERR_HWERROR); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } @@ -121,21 +108,13 @@ cbc_crypt(char *key, char *buf, size_t len, unsigned int mode, char *ivec) int ecb_crypt(char *key, char *buf, size_t len, unsigned int mode) { -/* EXPORT DELETE START */ struct desparams dp; dp.des_mode = ECB; return (common_crypt(key, buf, len, mode, &dp)); -#if 0 -/* EXPORT DELETE END */ - return (DESERR_HWERROR); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } -/* EXPORT DELETE START */ /* * Common code to cbc_crypt() & ecb_crypt() @@ -185,9 +164,7 @@ software: return (DESERR_HWERROR); return (desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE); } -/* EXPORT DELETE END */ -/* EXPORT DELETE START */ static int desN_crypt(des_block keys[], int keynum, char *buf, unsigned int len, unsigned int mode, char *ivec) @@ -223,7 +200,6 @@ desN_crypt(des_block keys[], int keynum, char *buf, unsigned int len, return (stat); } -/* EXPORT DELETE END */ @@ -231,12 +207,5 @@ int __cbc_triple_crypt(des_block keys[], char *buf, uint_t len, uint_t mode, char *ivec) { -/* EXPORT DELETE START */ return (desN_crypt(keys, 3, buf, len, mode, ivec)); -#if 0 -/* EXPORT DELETE END */ - return (DESERR_HWERROR); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } diff --git a/usr/src/lib/libnsl/des/des_soft.c b/usr/src/lib/libnsl/des/des_soft.c index ccd2942c85..4bfe458ad4 100644 --- a/usr/src/lib/libnsl/des/des_soft.c +++ b/usr/src/lib/libnsl/des/des_soft.c @@ -33,8 +33,6 @@ * under license from the Regents of the University of California. */ -#pragma 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 @@ -162,7 +160,6 @@ des_setparity_g(des_block *p) int __des_crypt(char *buf, unsigned len, struct desparams *desp) { -/* EXPORT DELETE START */ short i; unsigned mode; unsigned dir; @@ -201,7 +198,6 @@ __des_crypt(char *buf, unsigned len, struct desparams *desp) buf += 8; len -= 8; } -/* EXPORT DELETE END */ return (1); } @@ -213,7 +209,6 @@ __des_crypt(char *buf, unsigned len, struct desparams *desp) static int __des_setkey(uchar_t userkey[8], struct deskeydata *kd, unsigned dir) { -/* EXPORT DELETE START */ int32_t C, D; short i; @@ -293,7 +288,6 @@ __des_setkey(uchar_t userkey[8], struct deskeydata *kd, unsigned dir) } } -/* EXPORT DELETE END */ return (1); } @@ -309,7 +303,6 @@ __des_setkey(uchar_t userkey[8], struct deskeydata *kd, unsigned dir) static int __des_encrypt(uchar_t *data, struct deskeydata *kd) { -/* EXPORT DELETE START */ chunk_t work1, work2; /* @@ -476,6 +469,5 @@ __des_encrypt(uchar_t *data, struct deskeydata *kd) data[6] = work2.byte6; data[7] = work2.byte7; -/* EXPORT DELETE END */ return (1); } diff --git a/usr/src/lib/libnsl/key/xcrypt.c b/usr/src/lib/libnsl/key/xcrypt.c index 5201ae3e64..9dea15752c 100644 --- a/usr/src/lib/libnsl/key/xcrypt.c +++ b/usr/src/lib/libnsl/key/xcrypt.c @@ -33,8 +33,6 @@ * under license from the Regents of the University of California. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Hex encryption/decryption and utility routines */ @@ -60,7 +58,6 @@ static char hexval(); int passwd2des(char *, char *); static int weak_DES_key(des_block); -/* EXPORT DELETE START */ /* * For export control reasons, we want to limit the maximum size of * data that can be encrypted or decrypted. We limit this to 1024 @@ -73,7 +70,6 @@ static int weak_DES_key(des_block); * and we have reason to believe this is ok for export. */ #define MAX_KEY_CRYPT_LEN 144 -/* EXPORT DELETE END */ /* * Encrypt a secret key given passwd @@ -85,7 +81,6 @@ xencrypt(secret, passwd) char *secret; char *passwd; { -/* EXPORT DELETE START */ char key[8]; char ivec[8]; char *buf; @@ -108,12 +103,6 @@ xencrypt(secret, passwd) (void) bin2hex(len, (unsigned char *) buf, secret); free(buf); return (1); -#if 0 -/* EXPORT DELETE END */ - return (0); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } /* @@ -126,7 +115,6 @@ xdecrypt(secret, passwd) char *secret; char *passwd; { -/* EXPORT DELETE START */ char key[8]; char ivec[8]; char *buf; @@ -150,12 +138,6 @@ xdecrypt(secret, passwd) (void) bin2hex(len, (unsigned char *) buf, secret); free(buf); return (1); -#if 0 -/* EXPORT DELETE END */ - return (0); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } /* @@ -264,7 +246,6 @@ xencrypt_g( char **encrypted_secret, /* out */ bool_t do_chksum) /* in */ { -/* EXPORT DELETE START */ des_block key; char ivec[8]; char *binkeybuf; @@ -342,12 +323,6 @@ xencrypt_g( free(binkeybuf); *encrypted_secret = hexkeybuf; return (1); -#if 0 -/* EXPORT DELETE END */ - return (0); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } /* @@ -375,7 +350,6 @@ xdecrypt_g( const char netname[], /* in */ bool_t do_chksum) /* in */ { -/* EXPORT DELETE START */ des_block key; char ivec[8]; char *buf; @@ -443,12 +417,6 @@ xdecrypt_g( secret[hexkeybytes] = '\0'; return (1); -#if 0 -/* EXPORT DELETE END */ - return (0); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } diff --git a/usr/src/lib/libsasl/Makefile b/usr/src/lib/libsasl/Makefile index c0e42d0b70..82ae0bd352 100644 --- a/usr/src/lib/libsasl/Makefile +++ b/usr/src/lib/libsasl/Makefile @@ -78,91 +78,6 @@ THIRDPARTYLICENSE: LICENSE.txt CLOBBERFILES += THIRDPARTYLICENSE -# EXPORT DELETE START -# CRYPT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) Makefile+ \ - lib/client.c+ \ - lib/server.c+ \ - lib/common.c+ \ - lib/saslint.h+ \ - include/plugin_common.h+ - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < lib/client.c > lib/client.c+ - $(MV) lib/client.c+ lib/client.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < lib/server.c > lib/server.c+ - $(MV) lib/server.c+ lib/server.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < lib/common.c > lib/common.c+ - $(MV) lib/common.c+ lib/common.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < lib/saslint.h > lib/saslint.h+ - $(MV) lib/saslint.h+ lib/saslint.h - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < include/plugin_common.h > include/plugin_common.h+ - $(MV) include/plugin_common.h+ include/plugin_common.h - - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - - $(CHMOD) 444 Makefile \ - lib/client.c \ - lib/server.c \ - lib/common.c \ - lib/saslint.h \ - include/plugin_common.h - -CRYPT_SRC: - $(RM) Makefile+ lib/common.c+ - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < lib/common.c | $(SED) -e "/EXPORT DELETE/d" \ - > lib/common.c+ - $(MV) lib/common.c+ lib/common.c - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < lib/client.c | $(SED) -e "/EXPORT DELETE/d" \ - > lib/client.c+ - $(MV) lib/client.c+ lib/client.c - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < lib/server.c | $(SED) -e "/EXPORT DELETE/d" \ - > lib/server.c+ - $(MV) lib/server.c+ lib/server.c - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < lib/saslint.h | $(SED) -e "/EXPORT DELETE/d" \ - > lib/saslint.h+ - $(MV) lib/saslint.h+ lib/saslint.h - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < include/plugin_common.h | $(SED) -e "/EXPORT DELETE/d" \ - > include/plugin_common.h+ - $(MV) include/plugin_common.h+ include/plugin_common.h - - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile | $(SED) -e "/^# EXPORT DELETE/d" > Makefile+ - $(MV) Makefile+ Makefile - - $(CHMOD) 444 Makefile \ - lib/client.c \ - lib/server.c \ - lib/common.c \ - lib/saslint.h \ - include/plugin_common.h - -# CRYPT DELETE END -# EXPORT DELETE END - include ../Makefile.targ .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/libsasl/include/plugin_common.h b/usr/src/lib/libsasl/include/plugin_common.h index f10da39db5..cb4998f70d 100644 --- a/usr/src/lib/libsasl/include/plugin_common.h +++ b/usr/src/lib/libsasl/include/plugin_common.h @@ -2,7 +2,6 @@ * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* Generic SASL plugin utility functions * Rob Siemborski @@ -204,8 +203,6 @@ int _plug_parseuser(const sasl_utils_t *utils, const char *serverFQDN, const char *input); #ifdef _INTEGRATED_SOLARIS_ -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ typedef void reg_sun_t(void *); #define REG_PLUG( X, Y ) { \ @@ -216,8 +213,6 @@ typedef void reg_sun_t(void *); if (func != NULL && l == 0) \ (*func)(Y); \ } -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ int use_locale(const char *lang_list, int is_client); const char *convert_prompt(const sasl_utils_t *utils, void **h, const char *s); diff --git a/usr/src/lib/libsasl/lib/client.c b/usr/src/lib/libsasl/lib/client.c index 7050ef5a9f..d99c449a7d 100644 --- a/usr/src/lib/libsasl/lib/client.c +++ b/usr/src/lib/libsasl/lib/client.c @@ -2,7 +2,6 @@ * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SASL server API implementation * Rob Siemborski @@ -198,11 +197,7 @@ int _sasl_client_add_plugin(void *ctx, cmech_list_t *cmechlist; #ifdef _INTEGRATED_SOLARIS_ _sasl_global_context_t *gctx = ctx == NULL ? _sasl_gbl_ctx() : ctx; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ int sun_reg; - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #endif /* _INTEGRATED_SOLARIS_ */ int i; cmechanism_t *m; @@ -239,13 +234,9 @@ int _sasl_client_add_plugin(void *ctx, result = entry_point(cmechlist->utils, SASL_CLIENT_PLUG_VERSION, &version, &pluglist, &plugcount); - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ sun_reg = _is_sun_reg(pluglist); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (result != SASL_OK) { #ifdef _SUN_SDK_ @@ -309,13 +300,9 @@ int _sasl_client_add_plugin(void *ctx, sasl_FREE(mech); return SASL_NOMEM; } - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ mech->sun_reg = sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ mech->version = version; mech->next = cmechlist->mech_list; cmechlist->mech_list = mech; @@ -843,15 +830,11 @@ int sasl_client_start(sasl_conn_t *conn, if (minssf > m->plug->max_ssf) break; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* If not SUN supplied mech, it has no strength */ if (minssf > 0 && !m->sun_reg) break; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* Does it meet our security properties? */ myflags = conn->props.security_flags; @@ -879,43 +862,26 @@ int sasl_client_start(sasl_conn_t *conn, } #ifdef PREFER_MECH - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (strcasecmp(m->plug->mech_name, PREFER_MECH) && bestm && (m->sun_reg && m->plug->max_ssf <= bestssf) || (m->plug->max_ssf == 0)) { #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (strcasecmp(m->plug->mech_name, PREFER_MECH) && bestm && m->plug->max_ssf <= bestssf) { - - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* this mechanism isn't our favorite, and it's no better than what we already have! */ break; } #else - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (bestm && m->sun_reg && m->plug->max_ssf <= bestssf) { #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (bestm && m->plug->max_ssf <= bestssf) { - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* this mechanism is no better than what we already have! */ break; @@ -949,19 +915,11 @@ int sasl_client_start(sasl_conn_t *conn, if (mech) { *mech = m->plug->mech_name; } - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ bestssf = m->sun_reg ? m->plug->max_ssf : 0; #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ bestssf = m->plug->max_ssf; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ bestm = m; break; } @@ -989,8 +947,6 @@ int sasl_client_start(sasl_conn_t *conn, c_conn->cparams->external_ssf = conn->external.ssf; c_conn->cparams->props = conn->props; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (!bestm->sun_reg) { c_conn->cparams->props.min_ssf = 0; @@ -998,8 +954,6 @@ int sasl_client_start(sasl_conn_t *conn, } c_conn->base.sun_reg = bestm->sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ c_conn->mech = bestm; /* init that plugin */ @@ -1221,15 +1175,11 @@ int _sasl_client_listmech(sasl_conn_t *conn, if (minssf > m->plug->max_ssf) continue; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* If not SUN supplied mech, it has no strength */ if (minssf > 0 && !m->sun_reg) continue; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* does it meet our security properties? */ if (((conn->props.security_flags ^ m->plug->security_flags) diff --git a/usr/src/lib/libsasl/lib/common.c b/usr/src/lib/libsasl/lib/common.c index baceb2ae5d..b4fe5d1d86 100644 --- a/usr/src/lib/libsasl/lib/common.c +++ b/usr/src/lib/libsasl/lib/common.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* common.c - Functions that are common to server and clinet * Rob Siemborski * Tim Martin @@ -307,7 +305,6 @@ int sasl_encodev(sasl_conn_t *conn, unsigned i; size_t total_size = 0; - /* EXPORT DELETE START */ if (!conn) return SASL_BADPARAM; if (! invec || ! output || ! outputlen || numiov < 1) PARAMERROR(conn); @@ -348,17 +345,14 @@ int sasl_encodev(sasl_conn_t *conn, *output = conn->encode_buf->data; *outputlen = conn->encode_buf->curlen; - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ } else if (!conn->sun_reg) { INTERROR(conn, SASL_FAIL); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ } else { result = conn->oparams.encode(conn->context, invec, numiov, output, outputlen); } - /* EXPORT DELETE END */ RETURN(conn, result); } @@ -369,7 +363,6 @@ int sasl_decode(sasl_conn_t *conn, const char **output, unsigned *outputlen) { int result; - /* EXPORT DELETE START */ #ifdef _SUN_SDK_ const _sasl_global_context_t *gctx; #endif /* _SUN_SDK_ */ @@ -423,12 +416,10 @@ int sasl_decode(sasl_conn_t *conn, *outputlen = inputlen; return SASL_OK; - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ } else if (!conn->sun_reg) { INTERROR(conn, SASL_FAIL); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ } else { result = conn->oparams.decode(conn->context, input, inputlen, output, outputlen); @@ -439,7 +430,6 @@ int sasl_decode(sasl_conn_t *conn, RETURN(conn, result); } - /* EXPORT DELETE END */ #ifdef _SUN_SDK_ return SASL_FAIL; #else @@ -747,14 +737,10 @@ int sasl_getprop(sasl_conn_t *conn, int propnum, const void **pvalue) switch(propnum) { case SASL_SSF: - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (!conn->sun_reg) conn->oparams.mech_ssf = 0; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *(sasl_ssf_t **)pvalue= &conn->oparams.mech_ssf; break; case SASL_MAXOUTBUF: @@ -1304,8 +1290,6 @@ const char *sasl_errdetail(sasl_conn_t *conn) return conn->errdetail_buf; } -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ DEFINE_STATIC_MUTEX(reg_mutex); typedef struct reg_list { @@ -1353,8 +1337,6 @@ _register_plugin(void *arg) } } #endif /* _INTEGRATED_SOLARIS_ */ -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ /* Note that this needs the global callbacks, so if you don't give getcallbacks * a sasl_conn_t, you're going to need to pass it yourself (or else we couldn't @@ -1374,8 +1356,6 @@ static int _sasl_global_getopt(void *context, global_callbacks = (const sasl_global_callbacks_t *) context; #ifdef _SUN_SDK_ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (strcmp("reg_sun_plug", option) == 0) { *result = (const char *)_register_plugin; @@ -1383,8 +1363,6 @@ static int _sasl_global_getopt(void *context, return (SASL_OK); } #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (global_callbacks) gctx = global_callbacks->gctx; @@ -2696,8 +2674,6 @@ _sasl_getconf(void *context __attribute__((unused)), const char **conf) return SASL_OK; } -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ #pragma fini(sasl_fini) int @@ -2713,8 +2689,6 @@ sasl_fini(void) return (0); } #endif /* _INTEGRATED_SOLARIS_ */ -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ #endif /* _SUN_SDK_ */ diff --git a/usr/src/lib/libsasl/lib/saslint.h b/usr/src/lib/libsasl/lib/saslint.h index 59c73f4a1b..61c386f735 100644 --- a/usr/src/lib/libsasl/lib/saslint.h +++ b/usr/src/lib/libsasl/lib/saslint.h @@ -2,7 +2,6 @@ * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* saslint.h - internal SASL library definitions * Rob Siemborski @@ -212,13 +211,9 @@ struct sasl_conn { #ifdef _SUN_SDK_ struct _sasl_global_context_s *gctx; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ int sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #endif /* _SUN_SDK_ */ }; @@ -240,13 +235,9 @@ typedef struct mechanism set to SASL_CONTINUE if delayed plugn loading */ char *plugname; /* for AUTHSOURCE tracking */ #ifdef _SUN_SDK_ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ int sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ sasl_server_plug_t *plug; /* * The global context needs to be stored with separately from the @@ -298,13 +289,9 @@ typedef struct cmechanism char *plugname; #ifdef _SUN_SDK_ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ int sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* * The global context needs to be stored with separately from the * the plugin because it will be overwritten when the plugin is @@ -803,13 +790,9 @@ extern int _sasl_auxprop_add_plugin(void *ctx, _sasl_global_context_t *_sasl_gbl_ctx(void); -/* EXPORT DELETE START */ -/* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ int _is_sun_reg(void *mech); #endif /* _INTEGRATED_SOLARIS_ */ -/* CRYPT DELETE END */ -/* EXPORT DELETE END */ /* unsupported functions that are used internally */ int sasl_randcreate(sasl_rand_t **rpool); diff --git a/usr/src/lib/libsasl/lib/server.c b/usr/src/lib/libsasl/lib/server.c index f76f973583..e19c15f08a 100644 --- a/usr/src/lib/libsasl/lib/server.c +++ b/usr/src/lib/libsasl/lib/server.c @@ -2,7 +2,6 @@ * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SASL server API implementation * Rob Siemborski @@ -386,13 +385,9 @@ int _sasl_server_add_plugin(void *ctx, _sasl_global_context_t *gctx = ctx == NULL ? _sasl_gbl_ctx() : ctx; mech_list_t *mechlist = gctx->mechlist; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ int sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #else { #endif /* _SUN_SDK_ */ @@ -429,13 +424,9 @@ int _sasl_server_add_plugin(void *ctx, result = entry_point(mechlist->utils, SASL_SERVER_PLUG_VERSION, &version, &pluglist, &plugcount); - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ sun_reg = _is_sun_reg(pluglist); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #ifdef _SUN_SDK_ if (result != SASL_OK) { @@ -513,13 +504,9 @@ int _sasl_server_add_plugin(void *ctx, } mech->version = version; #ifdef _SUN_SDK_ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ mech->sun_reg = sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* whether this mech actually has any users in it's db */ mech->condition = SASL_OK; @@ -1491,8 +1478,6 @@ static int mech_permitted(sasl_conn_t *conn, } } - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (!mech->sun_reg) { s_conn->sparams->props.min_ssf = 0; @@ -1500,8 +1485,6 @@ static int mech_permitted(sasl_conn_t *conn, } s_conn->base.sun_reg = mech->sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (conn->props.min_ssf < conn->external.ssf) { minssf = 0; } else { @@ -1509,20 +1492,12 @@ static int mech_permitted(sasl_conn_t *conn, } /* Generic mechanism */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* If not SUN supplied mech, it has no strength */ if (plug->max_ssf < minssf || (minssf > 0 && !mech->sun_reg)) { #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (plug->max_ssf < minssf) { - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #ifdef _INTEGRATED_SOLARIS_ sasl_seterror(conn, SASL_NOLOG, gettext("mech %s is too weak"), plug->mech_name); @@ -1576,20 +1551,12 @@ static int mech_permitted(sasl_conn_t *conn, } /* Generic mechanism */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* If not SUN supplied mech, it has no strength */ if (plug->max_ssf < minssf || (minssf > 0 && !mech->sun_reg)) { #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (plug->max_ssf < minssf) { - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #ifdef _INTEGRATED_SOLARIS_ sasl_seterror(conn, SASL_NOLOG, gettext("too weak")); #else diff --git a/usr/src/lib/libsldap/Makefile b/usr/src/lib/libsldap/Makefile index 8c74b86cc1..3447306dd1 100644 --- a/usr/src/lib/libsldap/Makefile +++ b/usr/src/lib/libsldap/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.lib @@ -76,16 +74,3 @@ $(POFILES): $(RM) messages.po FRC: - -# EXPORT DELETE START -EXPORT_SRC: - $(RM) -f common/ns_crypt.c+ Makefile+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" < \ - common/ns_crypt.c > common/ns_crypt.c+ - $(MV) common/ns_crypt.c+ common/ns_crypt.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile common/ns_crypt.c - -# EXPORT DELETE END diff --git a/usr/src/lib/libsldap/common/ns_crypt.c b/usr/src/lib/libsldap/common/ns_crypt.c index ee262596b1..69aa4b749e 100644 --- a/usr/src/lib/libsldap/common/ns_crypt.c +++ b/usr/src/lib/libsldap/common/ns_crypt.c @@ -27,8 +27,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdlib.h> #include <string.h> #include <libintl.h> @@ -40,11 +38,8 @@ #include <sys/time.h> #include "ns_sldap.h" #include "ns_internal.h" -/* EXPORT DELETE START */ #include <crypt.h> -#define NS_DOMESTIC 1 - static char t1[ROTORSIZE]; static char t2[ROTORSIZE]; static char t3[ROTORSIZE]; @@ -113,13 +108,11 @@ ascii2hex(char *anHexaStr, int *aResLen) *aResLen = theLen; return (theRes); } -/* EXPORT DELETE END */ static void c_setup() { -/* EXPORT DELETE START */ int ic, i, k, temp; unsigned random; char buf[13]; @@ -190,14 +183,12 @@ modvalue(char *str, int len, int *mod_len) *mod_len = i; } return (s); -/* EXPORT DELETE END */ } char * evalue(char *ptr) { -/* EXPORT DELETE START */ char *modv, *str, *ev; int modv_len; size_t len; @@ -225,19 +216,12 @@ evalue(char *ptr) free(str); str = NULL; return (ev); -#ifndef NS_DOMESTIC -/* EXPORT DELETE END */ - return (strdup(ptr)); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } char * dvalue(char *ptr) { -/* EXPORT DELETE START */ char *modv, *str, *sb; int len; @@ -253,10 +237,4 @@ dvalue(char *ptr) free(str); str = NULL; return (modv); -#ifndef NS_DOMESTIC -/* EXPORT DELETE END */ - return (strdup(ptr)); -/* EXPORT DELETE START */ -#endif -/* EXPORT DELETE END */ } diff --git a/usr/src/lib/pam_modules/krb5/Makefile b/usr/src/lib/pam_modules/krb5/Makefile index 87724bcd62..27c168cd9e 100644 --- a/usr/src/lib/pam_modules/krb5/Makefile +++ b/usr/src/lib/pam_modules/krb5/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.lib @@ -41,13 +39,6 @@ clobber := TARGET= clobber install := TARGET= install lint := TARGET= lint -# EXPORT DELETE START -# CRYPT DELETE START -EXPORT_SRC := TARGET= EXPORT_SRC -CRYPT_SRC := TARGET= CRYPT_SRC -# CRYPT DELETE END -# EXPORT DELETE END - .KEEP_STATE: all clean clobber install lint: $(SUBDIRS) @@ -60,36 +51,6 @@ _msg: $(MSGDOMAINPOFILE) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) -# EXPORT DELETE START -# CRYPT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile.com > Makefile.com+ - $(MV) Makefile.com+ Makefile.com - $(CHMOD) 444 Makefile.com - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -CRYPT_SRC: - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile.com \ - | $(SED) -e "/EXPORT DELETE/d" \ - > Makefile.com+ - $(MV) Makefile.com+ Makefile.com - $(CHMOD) 444 Makefile.com - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile \ - | $(SED) -e "/EXPORT DELETE/d" \ - > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile -# CRYPT DELETE END -# EXPORT DELETE END - FRC: include $(SRC)/Makefile.msg.targ diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/Makefile b/usr/src/lib/pkcs11/pkcs11_softtoken/common/Makefile deleted file mode 100644 index fefdc1f893..0000000000 --- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/Makefile +++ /dev/null @@ -1,47 +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 2003 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# lib/pkcs11/pkcs11_softtoken/common/Makefile -# -# include global definitions -include $(SRC)/Makefile.master - -.KEEP_STATE: - -FRC: - -# EXPORT DELETE START -EXPORT_SRC: - $(RM) Makefile+ softRSA.c+ - sed -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < softRSA.c > softRSA.c+ - $(MV) softRSA.c+ softRSA.c - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(RM) Makefile - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile softRSA.c -# EXPORT DELETE END diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRSA.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRSA.c index a919b32d0e..a3976f7832 100644 --- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRSA.c +++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRSA.c @@ -45,8 +45,6 @@ soft_rsa_encrypt(soft_object_t *key, CK_BYTE_PTR in, uint32_t in_len, CK_RV rv = CKR_OK; -/* EXPORT DELETE START */ - uchar_t expo[MAX_KEY_ATTR_BUFLEN]; uchar_t modulus[MAX_KEY_ATTR_BUFLEN]; uint32_t expo_len = sizeof (expo); @@ -82,8 +80,6 @@ soft_rsa_encrypt(soft_object_t *key, CK_BYTE_PTR in, uint32_t in_len, clean1: -/* EXPORT DELETE END */ - return (rv); } @@ -95,8 +91,6 @@ soft_rsa_decrypt(soft_object_t *key, CK_BYTE_PTR in, uint32_t in_len, CK_RV rv = CKR_OK; -/* EXPORT DELETE START */ - uchar_t modulus[MAX_KEY_ATTR_BUFLEN]; uchar_t prime1[MAX_KEY_ATTR_BUFLEN]; uchar_t prime2[MAX_KEY_ATTR_BUFLEN]; @@ -184,8 +178,6 @@ soft_rsa_decrypt(soft_object_t *key, CK_BYTE_PTR in, uint32_t in_len, clean1: -/* EXPORT DELETE END */ - return (rv); } diff --git a/usr/src/lib/sasl_plugins/Makefile b/usr/src/lib/sasl_plugins/Makefile index d014d39264..2bd546fa55 100644 --- a/usr/src/lib/sasl_plugins/Makefile +++ b/usr/src/lib/sasl_plugins/Makefile @@ -48,53 +48,6 @@ $(SUBDIRS): FRC FRC: -# EXPORT DELETE START -# CRYPT DELETE START -# Special target to clean up the source tree for export distribution -# Warning: This target changes the source tree -EXPORT_SRC: - $(RM) Makefile+ \ - digestmd5/digestmd5.c+ \ - gssapi/gssapi.c+ - - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < digestmd5/digestmd5.c > digestmd5/digestmd5.c+ - $(MV) digestmd5/digestmd5.c+ digestmd5/digestmd5.c - - $(SED) -e "/EXPORT DELETE START/,/EXPORT DELETE END/d" \ - < gssapi/gssapi.c > gssapi/gssapi.c+ - $(MV) gssapi/gssapi.c+ gssapi/gssapi.c - - $(CHMOD) 444 \ - Makefile \ - digestmd5/digestmd5.c \ - gssapi/gssapi.c - -CRYPT_SRC: - $(RM) Makefile+ - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < digestmd5/digestmd5.c | $(SED) -e "/EXPORT DELETE/d" \ - > digestmd5/digestmd5.c+ - $(MV) digestmd5/digestmd5.c+ digestmd5/digestmd5.c - - $(SED) -e "/CRYPT DELETE START/,/CRYPT DELETE END/d" \ - < gssapi/gssapi.c | $(SED) -e "/EXPORT DELETE/d" \ - > gssapi/gssapi.c+ - $(MV) gssapi/gssapi.c+ gssapi/gssapi.c - - $(SED) -e "/^# CRYPT DELETE START/,/^# CRYPT DELETE END/d" \ - < Makefile | $(SED) -e "/^# EXPORT DELETE/d" > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile digestmd5/digestmd5.c gssapi/gssapi.c - -# CRYPT DELETE END -# EXPORT DELETE END - include ../Makefile.targ .PARALLEL: $(SUBDIRS) diff --git a/usr/src/lib/sasl_plugins/digestmd5/digestmd5.c b/usr/src/lib/sasl_plugins/digestmd5/digestmd5.c index 3b5733d3af..41124cdd49 100644 --- a/usr/src/lib/sasl_plugins/digestmd5/digestmd5.c +++ b/usr/src/lib/sasl_plugins/digestmd5/digestmd5.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* DIGEST-MD5 SASL plugin * Rob Siemborski * Tim Martin @@ -63,7 +61,6 @@ #include <fcntl.h> #include <ctype.h> -/* EXPORT DELETE START */ /* DES support */ #ifdef WITH_DES # ifdef WITH_SSL_DES @@ -72,7 +69,6 @@ # include <des.h> # endif #endif /* WITH_DES */ -/* EXPORT DELETE END */ #ifdef WIN32 # include <winsock.h> @@ -721,7 +717,6 @@ static void get_pair(char **in, char **name, char **value) *in = endpair; } -/* EXPORT DELETE START */ #ifdef WITH_DES struct des_context_s { des_key_schedule keysched; /* key schedule for des initialization */ @@ -1189,11 +1184,9 @@ static int enc_rc4(context_t *text, } #endif /* WITH_RC4 */ -/* EXPORT DELETE END */ struct digest_cipher available_ciphers[] = { - /* EXPORT DELETE START */ #ifdef WITH_RC4 { "rc4-40", 40, 5, 0x01, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 }, { "rc4-56", 56, 7, 0x02, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 }, @@ -1203,7 +1196,6 @@ struct digest_cipher available_ciphers[] = { "des", 55, 16, 0x08, &enc_des, &dec_des, &init_des, &free_des }, { "3des", 112, 16, 0x10, &enc_3des, &dec_3des, &init_3des, &free_des }, #endif - /* EXPORT DELETE END */ { NULL, 0, 0, 0, NULL, NULL, NULL, NULL } }; @@ -3688,17 +3680,13 @@ static sasl_server_plug_t digestmd5_server_plugins[] = { { "DIGEST-MD5", /* mech_name */ - /* EXPORT DELETE START */ #ifdef WITH_RC4 128, /* max_ssf */ #elif WITH_DES 112, #else - /* EXPORT DELETE END */ 0, - /* EXPORT DELETE START */ #endif - /* EXPORT DELETE END */ SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS | SASL_SEC_MUTUAL_AUTH, /* security_flags */ @@ -3779,8 +3767,6 @@ int digestmd5_server_plug_init(sasl_utils_t *utils, #endif /* USE_UEF_CLIENT */ #endif /* _SUN_SDK_ */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* * Let libsasl know that we are a "Sun" plugin so that privacy @@ -3788,8 +3774,6 @@ int digestmd5_server_plug_init(sasl_utils_t *utils, */ REG_PLUG("DIGEST-MD5", digestmd5_server_plugins); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *out_version = SASL_SERVER_PLUG_VERSION; *pluglist = digestmd5_server_plugins; @@ -5178,17 +5162,13 @@ static sasl_client_plug_t digestmd5_client_plugins[] = { { "DIGEST-MD5", - /* EXPORT DELETE START */ #ifdef WITH_RC4 /* mech_name */ 128, /* max ssf */ #elif WITH_DES 112, #else - /* EXPORT DELETE END */ 0, - /* EXPORT DELETE START */ #endif - /* EXPORT DELETE END */ SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS | SASL_SEC_MUTUAL_AUTH, /* security_flags */ @@ -5251,8 +5231,6 @@ int digestmd5_client_plug_init(sasl_utils_t *utils, #endif /* USE_UEF_CLIENT */ #endif /* _SUN_SDK_ */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* * Let libsasl know that we are a "Sun" plugin so that privacy @@ -5260,8 +5238,6 @@ int digestmd5_client_plug_init(sasl_utils_t *utils, */ REG_PLUG("DIGEST-MD5", digestmd5_client_plugins); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *out_version = SASL_CLIENT_PLUG_VERSION; *pluglist = digestmd5_client_plugins; diff --git a/usr/src/lib/sasl_plugins/gssapi/gssapi.c b/usr/src/lib/sasl_plugins/gssapi/gssapi.c index 302d029380..2b03caf706 100644 --- a/usr/src/lib/sasl_plugins/gssapi/gssapi.c +++ b/usr/src/lib/sasl_plugins/gssapi/gssapi.c @@ -3,8 +3,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* GSSAPI SASL plugin * Leif Johansson * Rob Siemborski (SASL v2 Conversion) @@ -1486,8 +1484,6 @@ int gssapiv2_server_plug_init( #endif #endif /* !_SUN_SDK_ */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* * Let libsasl know that we are a "Sun" plugin so that privacy @@ -1495,8 +1491,6 @@ int gssapiv2_server_plug_init( */ REG_PLUG("GSSAPI", gssapi_server_plugins); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *out_version = SASL_SERVER_PLUG_VERSION; *pluglist = gssapi_server_plugins; @@ -2186,8 +2180,6 @@ int gssapiv2_client_plug_init(const sasl_utils_t *utils __attribute__((unused)), return SASL_BADVERS; } - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* * Let libsasl know that we are a "Sun" plugin so that privacy @@ -2195,8 +2187,6 @@ int gssapiv2_client_plug_init(const sasl_utils_t *utils __attribute__((unused)), */ REG_PLUG("GSSAPI", gssapi_client_plugins); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *out_version = SASL_CLIENT_PLUG_VERSION; *pluglist = gssapi_client_plugins; |