# HG changeset patch
# User Darren J Moffat <Darren.Moffat@Sun.COM>
# Date 1276159061 25200
# Node ID d42e6e6980b33775b1ae19b36a303bfcac702763
# Parent  6c7cb543efd1164648a3ec10d63e4b1bee798479
PSARC 2010/191 Private Crypto Framework header files
6956768 private crypto framework headers need packaging up

diff -r 6c7cb543efd1 -r d42e6e6980b3 exception_lists/packaging
--- a/exception_lists/packaging	Thu Jun 10 08:35:29 2010 +0200
+++ b/exception_lists/packaging	Thu Jun 10 01:37:41 2010 -0700
@@ -49,15 +49,10 @@
 # Private/Internal libraries of the Cryptographic Framework.
 #
 lib/libkcfd.so
-lib/llib-lcryptoutil
-lib/llib-lcryptoutil.ln
-lib/amd64/llib-lcryptoutil.ln		i386
-lib/sparcv9/llib-lcryptoutil.ln		sparc
 lib/llib-lelfsign
 lib/llib-lelfsign.ln
 lib/llib-lkcfd
 lib/llib-lkcfd.ln
-usr/include/cryptoutil.h
 usr/include/libelfsign.h
 usr/lib/llib-lsoftcrypto
 usr/lib/llib-lsoftcrypto.ln
@@ -452,8 +447,6 @@
 #
 usr/include/sys/crypto/elfsign.h
 usr/include/sys/crypto/impl.h
-usr/include/sys/crypto/ioctl.h
-usr/include/sys/crypto/ioctladmin.h
 usr/include/sys/crypto/ops_impl.h
 usr/include/sys/crypto/sched_impl.h
 #
diff -r 6c7cb543efd1 -r d42e6e6980b3 usr/src/pkg/manifests/developer-library-lint.mf
--- a/usr/src/pkg/manifests/developer-library-lint.mf	Thu Jun 10 08:35:29 2010 +0200
+++ b/usr/src/pkg/manifests/developer-library-lint.mf	Thu Jun 10 01:37:41 2010 -0700
@@ -52,6 +52,7 @@
 file path=lib/$(ARCH64)/llib-lctf.ln
 file path=lib/$(ARCH64)/llib-lcurses
 file path=lib/$(ARCH64)/llib-lcurses.ln
+file path=lib/$(ARCH64)/llib-lcryptoutil.ln
 file path=lib/$(ARCH64)/llib-ldevice.ln
 file path=lib/$(ARCH64)/llib-ldevid.ln
 file path=lib/$(ARCH64)/llib-ldevinfo.ln
@@ -107,6 +108,8 @@
 file path=lib/llib-lctf.ln
 file path=lib/llib-lcurses
 file path=lib/llib-lcurses.ln
+file path=lib/llib-lcryptoutil
+file path=lib/llib-lcryptoutil.ln
 file path=lib/llib-ldevice
 file path=lib/llib-ldevice.ln
 file path=lib/llib-ldevid
diff -r 6c7cb543efd1 -r d42e6e6980b3 usr/src/pkg/manifests/system-header.mf
--- a/usr/src/pkg/manifests/system-header.mf	Thu Jun 10 08:35:29 2010 +0200
+++ b/usr/src/pkg/manifests/system-header.mf	Thu Jun 10 01:37:41 2010 -0700
@@ -327,6 +327,7 @@
 file path=usr/include/config_admin.h
 file path=usr/include/cpio.h
 file path=usr/include/crypt.h
+file path=usr/include/cryptoutil.h
 file path=usr/include/ctype.h
 file path=usr/include/curses.h
 file path=usr/include/dat/dat.h
@@ -862,6 +863,8 @@
 file path=usr/include/sys/crtctl.h
 file path=usr/include/sys/crypto/api.h
 file path=usr/include/sys/crypto/common.h
+file path=usr/include/sys/crypto/ioctl.h
+file path=usr/include/sys/crypto/ioctladmin.h
 file path=usr/include/sys/crypto/spi.h
 file path=usr/include/sys/cs.h
 file path=usr/include/sys/cs_priv.h
diff -r 6c7cb543efd1 -r d42e6e6980b3 usr/src/uts/common/sys/crypto/api.h
--- a/usr/src/uts/common/sys/crypto/api.h	Thu Jun 10 08:35:29 2010 +0200
+++ b/usr/src/uts/common/sys/crypto/api.h	Thu Jun 10 01:37:41 2010 -0700
@@ -32,9 +32,6 @@
 #include <sys/types.h>
 #include <sys/crypto/common.h>
 
-#ifdef	_KERNEL
-
-
 typedef long crypto_req_id_t;
 typedef void *crypto_bc_t;
 typedef void *crypto_context_t;
@@ -387,8 +384,6 @@
 extern int crypto_bufcall(crypto_bc_t bc, void (*func)(void *arg), void *arg);
 extern int crypto_unbufcall(crypto_bc_t bc);
 
-#endif	/* _KERNEL */
-
 /*
  * To obtain the list of key size ranges supported by a mechanism.
  */
@@ -406,7 +401,6 @@
 	crypto_mech_usage_t mi_usage;
 } crypto_mechanism_info_t;
 
-#ifdef	_KERNEL
 #ifdef	_SYSCALL32
 
 typedef struct crypto_mechanism_info32 {
@@ -417,7 +411,6 @@
 } crypto_mechanism_info32_t;
 
 #endif	/* _SYSCALL32 */
-#endif	/* _KERNEL */
 
 extern int crypto_get_all_mech_info(crypto_mech_type_t,
     crypto_mechanism_info_t **, uint_t *, int);