PSARC/2004/678 EOF SCF_ Smartcard APIs

PSARC/2005/106 iButton Smartcard EOF
PSARC/2005/107 Cyberflex Smartcard EOF
PSARC/2006/295 EOF pam_smartcard(5)
PSARC/2006/296 EOF smartcard(1m)
6857067 Smartcard EOF Removal

5 files changed, 5 insertions, 93 deletions

diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 557b39a8fe..2649d23a67 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -163,8 +163,6 @@ SUBDIRS += \
 	libinstzones	\
 	libpkg
 
-$(CLOSED_BUILD)SUBDIRS += \
-	$(CLOSED)/lib/smartcard
 SUBDIRS += \
 	passwdutil	\
 	pam_modules	\
@@ -361,8 +359,6 @@ MSGSUBDIRS=		\
 	pam_modules	\
 	pyzfs		\
 	rpcsec_gss
-$(CLOSED_BUILD)MSGSUBDIRS += \
-	$(CLOSED)/lib/smartcard
 MSGSUBDIRS += \
 	$($(MACH)_MSGSUBDIRS)
 
@@ -497,8 +493,7 @@ HDRSUBDIRS=		\
 
 $(CLOSED_BUILD)HDRSUBDIRS += \
 	$(CLOSED)/lib/libc_i18n	\
-	$(CLOSED)/lib/libike	\
-	$(CLOSED)/lib/smartcard
+	$(CLOSED)/lib/libike
 
 i386_HDRSUBDIRS=	\
 	libparted	\
@@ -551,9 +546,6 @@ _msg:			$(MSGSUBDIRS:%=%-nodepend) .WAIT _dc
 
 _dc:			$(DCSUBDIRS:%=%-nodepend)
 
-# dependencies for pam_modules (see below)
-$(CLOSED_BUILD)SMARTCARD=	$(CLOSED)/lib/smartcard
-
 #
 # Library interdependencies are called out explicitly here
 #
@@ -617,7 +609,7 @@ libwrap:	libnsl libsocket
 libwanboot:	libnvpair libresolv libnsl libsocket libdevinfo libinetutil \
 		libdhcputil
 libwanbootutil:	libnsl
-pam_modules:	libproject passwdutil $(SMARTCARD) smbsrv
+pam_modules:	libproject passwdutil smbsrv
 libscf:		libuutil libmd libgen libsmbios
 libinetsvc:	libscf
 librestart:	libuutil libscf
diff --git a/usr/src/lib/libpam/pam_appl.h b/usr/src/lib/libpam/pam_appl.h
index 8f23d195bc..52080dea7a 100644
--- a/usr/src/lib/libpam/pam_appl.h
+++ b/usr/src/lib/libpam/pam_appl.h
@@ -19,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef _PAM_APPL_H
 #define	_PAM_APPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 
 #ifdef	__cplusplus
@@ -108,15 +106,6 @@ struct pam_message {
 #define	PAM_TEXT_INFO		4	/* Textual information */
 
 /*
- * Sun's proprietary message types
- * Can these new new message types supported in version 2
- * have the numbers like -XXX (ie., negative numbers).
- * Hence will not clash with new proposals from X/OPEN
- */
-#define	PAM_MSG_NOCONF		2001	/* No confirmation from user */
-#define	PAM_CONV_INTERRUPT	2002	/* Return from conv() */
-
-/*
  * max # of messages passed to the application through the
  * conversation function call
  */
@@ -226,13 +215,6 @@ struct pam_repository {
 typedef struct pam_repository pam_repository_t;
 
 /*
- * PAM message version.
- * Sun proprietary pam_[sg]et_item() extension
- */
-#define	PAM_MSG_VERSION	3001		/* PAM message version supported */
-#define	PAM_MSG_VERSION_V2 "2.0"	/* PAM 2.0 message version */
-
-/*
  * pam_get_user is called to retrieve the user name (PAM_USER). If PAM_USER
  * is not set then this call will prompt for the user name using the
  * conversation function. This function should only be used by modules, not
diff --git a/usr/src/lib/libpam/pam_framework.c b/usr/src/lib/libpam/pam_framework.c
index 6544326585..848483ce75 100644
--- a/usr/src/lib/libpam/pam_framework.c
+++ b/usr/src/lib/libpam/pam_framework.c
@@ -110,14 +110,6 @@ pam_trace_iname(int item_type, char *iname_buf)
 {
 	char *name;
 
-	/*
-	 * XXX -- Contracted Consolidation Private
-	 *	  to be eliminated when dtlogin contract is terminated
-	 * Version number requested by PAM's client
-	 */
-	if (item_type == PAM_MSG_VERSION)
-		return ("msg_version");
-
 	if (item_type <= 0 ||
 	    item_type >= PAM_MAX_ITEMS ||
 	    (name = pam_inames[item_type]) == NULL) {
@@ -415,29 +407,6 @@ pam_set_item(pam_handle_t *pamh, int item_type, const void *item)
 		return (PAM_PERM_DENIED);
 
 	/*
-	 * XXX -- Contracted Consolidation Private
-	 *	  to be eliminated when dtlogin contract is terminated
-	 * Check if tag is Sun proprietary
-	 */
-	if (item_type == PAM_MSG_VERSION) {
-		if (pamh->pam_client_message_version_number)
-			free(pamh->pam_client_message_version_number);
-
-		if (item == NULL)
-			pamh->pam_client_message_version_number = NULL;
-		else
-			if ((pamh->pam_client_message_version_number =
-			    strdup((char *)item)) == NULL)
-				return (PAM_BUF_ERR);
-
-		pam_trace(PAM_DEBUG_ITEM,
-		    "pam_set_item(%p:%s)=%s", (void *)pamh,
-		    pam_trace_iname(item_type, iname_buf),
-		    item ? (char *)item : "NULL");
-		return (PAM_SUCCESS);
-	}
-
-	/*
 	 * Check that item_type is within valid range
 	 */
 
@@ -584,19 +553,6 @@ pam_get_item(const pam_handle_t *pamh, int item_type, void **item)
 	if (pamh == NULL)
 		return (PAM_SYSTEM_ERR);
 
-	/*
-	 * XXX -- Contracted Consolidation Private
-	 *	  to be eliminated when dtlogin contract is terminated
-	 * Check if tag is Sun proprietary
-	 */
-	if (item_type == PAM_MSG_VERSION) {
-		*item = pamh->pam_client_message_version_number;
-		pam_trace(PAM_DEBUG_ITEM, "pam_get_item(%p:%s)=%s",
-		    (void *)pamh, pam_trace_iname(item_type, iname_buf),
-		    *item ? (char *)*item : "NULL");
-		return (PAM_SUCCESS);
-	}
-
 	if (item_type <= 0 || item_type >= PAM_MAX_ITEMS)
 		return (PAM_SYMBOL_ERR);
 
@@ -2546,10 +2502,6 @@ clean_up(pam_handle_t *pamh)
 	pam_repository_t *auth_rep;
 
 	if (pamh) {
-		/* Cleanup Sun proprietary tag information */
-		if (pamh->pam_client_message_version_number)
-			free(pamh->pam_client_message_version_number);
-
 		while (pamh->include_depth >= 0) {
 			free_pam_conf_info(pamh);
 			pamh->include_depth--;
diff --git a/usr/src/lib/libpam/pam_impl.h b/usr/src/lib/libpam/pam_impl.h
index eea1931a95..7594521f1b 100644
--- a/usr/src/lib/libpam/pam_impl.h
+++ b/usr/src/lib/libpam/pam_impl.h
@@ -19,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_PAM_IMPL_H
 #define	_PAM_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -230,13 +228,6 @@ struct pam_handle {
 	struct	pam_module_data *ssd;		/* module specific data */
 	fd_list *fd;				/* module fd's */
 	env_list *pam_env;			/* environment variables */
-
-	/*
-	 * XXX -- Contracted Consolidation Private
-	 *	  to be eliminated when dtlogin contract is terminated
-	 * Version number requested by PAM's client
-	 */
-	char	*pam_client_message_version_number;
 };
 
 /*
diff --git a/usr/src/lib/pam_modules/Makefile b/usr/src/lib/pam_modules/Makefile
index 4a6ee913fd..fa74ccba7b 100644
--- a/usr/src/lib/pam_modules/Makefile
+++ b/usr/src/lib/pam_modules/Makefile
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/pam_modules/Makefile
 #
 
@@ -53,9 +51,6 @@ SUBDIRS = \
 	unix_cred	\
 	unix_session
 
-$(CLOSED_BUILD)SUBDIRS += \
-	$(CLOSED)/lib/pam_modules/smartcard
-
 all :=		TARGET= all
 catalog :=	TARGET= _msg
 clean :=	TARGET= clean