6414175 kcf.conf's supportedlist not providing much usefulness

@@ -17,19 +17,18 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef _CRYPTOADM_H
 #define _CRYPTOADM_H
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
+#include <sys/types.h>
 #include <sys/crypto/ioctladmin.h>
 #include <cryptoutil.h>
 #include <security/cryptoki.h>
 
 #ifdef __cplusplus

@@ -47,11 +46,11 @@
  * defined in usr/lib/libcryptoutil/common/cryptoutil.h.  The following is
  * the extra keywords and delimiters used in kcf.conf file.
  */
 #define SEP_SLASH               '/'
 #define EF_SUPPORTED            "supportedlist="
-#define HW_DRIVER_STRING        "driver_names"
+#define EF_UNLOAD               "unload"
 #define RANDOM                  "random"
 #define UEF_FRAME_LIB           "/usr/lib/libpkcs11.so"
 
 #define ADD_MODE        1
 #define DELETE_MODE     2

@@ -70,10 +69,11 @@
         prov_name_t     name;
         mechlist_t      *suplist; /* supported list */
         uint_t          sup_count;
         mechlist_t      *dislist; /* disabled list */
         uint_t          dis_count;
+        boolean_t       load; /* B_FALSE after cryptoadm unload */
 } entry_t;
 
 
 typedef struct entrylist {
         entry_t *pent;

@@ -93,25 +93,30 @@
 extern void free_mechlist(mechlist_t *);
 
 /* adm_kef_util */
 extern boolean_t is_device(char *);
 extern char *ent2str(entry_t *);
-extern entry_t *getent_kef(char *);
-extern int check_active_for_soft(char *, boolean_t *);
-extern int check_active_for_hard(char *, boolean_t *);
+extern entry_t *getent_kef(char *provname,
+                entrylist_t *pdevlist, entrylist_t *psoftlist);
+extern int check_kernel_for_soft(char *provname,
+                crypto_get_soft_list_t *psoftlist, boolean_t *in_kernel);
+extern int check_kernel_for_hard(char *provname,
+                crypto_get_dev_list_t *pdevlist, boolean_t *in_kernel);
 extern int disable_mechs(entry_t **, mechlist_t *, boolean_t, mechlist_t *);
 extern int enable_mechs(entry_t **, boolean_t, mechlist_t *);
 extern int get_kcfconf_info(entrylist_t **, entrylist_t **);
 extern int get_admindev_info(entrylist_t **, entrylist_t **);
 extern int get_mech_count(mechlist_t *);
+extern entry_t *create_entry(char *provname);
 extern int insert_kcfconf(entry_t *);
 extern int split_hw_provname(char *, char *, int *);
 extern int update_kcfconf(entry_t *, int);
 extern void free_entry(entry_t *);
 extern void free_entrylist(entrylist_t *);
 extern void print_mechlist(char *, mechlist_t *);
-extern void print_kef_policy(entry_t *, boolean_t, boolean_t);
+extern void print_kef_policy(char *provname, entry_t *pent,
+                boolean_t has_random, boolean_t has_mechs);
 extern boolean_t filter_mechlist(mechlist_t **, const char *);
 extern uentry_t *getent_uef(char *);
 
 
 /* adm_uef */

@@ -130,20 +135,24 @@
 extern int display_policy(uentry_t *);
 extern int update_pkcs11conf(uentry_t *);
 extern int update_policylist(uentry_t *, mechlist_t *, int);
 
 /* adm_kef */
-extern int list_mechlist_for_soft(char *);
+extern int list_mechlist_for_soft(char *provname,
+                entrylist_t *phardlist, entrylist_t *psoftlist);
 extern int list_mechlist_for_hard(char *);
-extern int list_policy_for_soft(char *);
-extern int list_policy_for_hard(char *);
+extern int list_policy_for_soft(char *provname,
+                entrylist_t *phardlist, entrylist_t *psoftlist);
+extern int list_policy_for_hard(char *provname,
+                entrylist_t *phardlist, entrylist_t *psoftlist,
+                crypto_get_dev_list_t *pdevlist);
 extern int disable_kef_software(char *, boolean_t, boolean_t, mechlist_t *);
 extern int disable_kef_hardware(char *, boolean_t, boolean_t, mechlist_t *);
 extern int enable_kef(char *, boolean_t, boolean_t, mechlist_t *);
 extern int install_kef(char *, mechlist_t *);
 extern int uninstall_kef(char *);
-extern int unload_kef_soft(char *, boolean_t);
+extern int unload_kef_soft(char *provname);
 extern int refresh(void);
 extern int start_daemon(void);
 extern int stop_daemon(void);
 
 /* adm_ioctl */

@@ -151,11 +160,12 @@
 extern crypto_load_soft_disabled_t *setup_soft_dis(entry_t *);
 extern crypto_load_dev_disabled_t *setup_dev_dis(entry_t *);
 extern crypto_unload_soft_module_t *setup_unload_soft(entry_t *);
 extern int get_dev_info(char *, int, int, mechlist_t **);
 extern int get_dev_list(crypto_get_dev_list_t **);
-extern int get_soft_info(char *, mechlist_t **);
+extern int get_soft_info(char *provname, mechlist_t **ppmechlist,
+                entrylist_t *phardlist, entrylist_t *psoftlist);
 extern int get_soft_list(crypto_get_soft_list_t **);
 
 /* adm_metaslot */
 extern int list_metaslot_info(boolean_t, boolean_t, mechlist_t *);
 extern int list_metaslot_policy();