6862532 "cryptoadm: failed to parse configuration" error
6353443 domestic (crypt) source build leaves stuff it shouldn't
6818180 mac(1) printed "invalid key" error message when user input an invalid passphrase

*** 1,12 ****
  
   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.
--- 1,11 ----
  
   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.
*** 17,37 ****
   fields enclosed by brackets "[]" replaced with your own identifying
   information: Portions Copyright [yyyy] [name of copyright owner]
  
   CDDL HEADER END
  
!  Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
   Use is subject to license terms.
  
- #ident  "%Z%%M% %I%     %E% SMI"
  
- 
          The Service Provider Interface for libgss and its Mechanisms
          ------------------------------------------------------------
  
- /* CRYPT DELETE START */
- 
  1.  The libgss SPI upto 11/2004
  
      Prior to PSARC 2004/810 the libgss SPI consisted of a function
      provided by each mechanism whose return value is a pointer to a
      structure full of references to the mechanism's entry points
--- 16,32 ----
   fields enclosed by brackets "[]" replaced with your own identifying
   information: Portions Copyright [yyyy] [name of copyright owner]
  
   CDDL HEADER END
  
!  Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   Use is subject to license terms.
  
  
          The Service Provider Interface for libgss and its Mechanisms
          ------------------------------------------------------------
  
  1.  The libgss SPI upto 11/2004
  
      Prior to PSARC 2004/810 the libgss SPI consisted of a function
      provided by each mechanism whose return value is a pointer to a
      structure full of references to the mechanism's entry points
*** 113,119 ****
       - libgss will look for and find the mechanism's
         GSS_Indicate_mechs() method and will call it to discover the
         mechanism provider's mechanism OIDs.
  
       - libgss will dlsym() each mechanism provider SPI method.
- 
- /* CRYPT DELETE END */
--- 108,112 ----