1 CDDL HEADER START

     2 

     3  The contents of this file are subject to the terms of the

     4  Common Development and Distribution License (the "License").

     5  You may not use this file except in compliance with the License.

     6 

     7  You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

     8  or http://www.opensolaris.org/os/licensing.

     9  See the License for the specific language governing permissions

    10  and limitations under the License.

    11 

    12  When distributing Covered Code, include this CDDL HEADER in each

    13  file and include the License file at usr/src/OPENSOLARIS.LICENSE.

    14  If applicable, add the following below this CDDL HEADER, with the

    15  fields enclosed by brackets "[]" replaced with your own identifying

    16  information: Portions Copyright [yyyy] [name of copyright owner]

    17  

    18 CDDL HEADER END

    19 

    20 Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.

    21 

    22 

    23 The patches found here were created to solve some issues in the PKCS#11

    24 middleware for CAC/PIV smartcards source code from:

    25 "The Code Conservatory" http://conservatory.github.io/ 

    26 

    27 The issue with this source code used from github

    28 https://github.com/Conservatory/CACKey

    29 appears to have come from merge conflict markers that resulted from the

    30 merge which originally created the repository.

    31 

    32 For example, the Makefile ends up with lots of git merge lines such as:

    33 <<<<<< HEAD

    34 >>>>>>> trunk

    35 

    36 it seems as though the various merge conflicts arose from the merge and

    37 pull request when the github source repository was attempted to be updated

    38 to latest version of CACKey.

    39 

    40 There were a lot of conflict markers resulting from that merge that now

    41 have been resolved with these patches and when applied to the source code,

    42 it will now compile and build on Solaris.

    43