Add nuxwdog patch from PKI

Signed-off-by: Alexander Scheel <ascheel@redhat.com>

.gitignore

@@ -3,3 +3,13 @@ jss-4.2.6.tar.gz
 /jss-4.4.0.tar.gz
 /jss-4.4.1.tar.gz
 /jss-4.4.2.tar.gz
+/jss-4.4.3.tar.gz
+/jss-4.4.4.tar.gz
+/jss-4.5.0-a1.tar.gz
+/jss-4.5.0-a2.tar.gz
+/jss-4.5.0-a3.tar.gz
+/jss-4.5.0-a4.tar.gz
+/jss-4.5.0-b1.tar.gz
+/jss-4.5.0.tar.gz
+/jss-4.5.1.tar.gz
+/jss-4.5.2.tar.gz

MPL-1.1.txt

@@ -1,470 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-

copr-build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+REPO=$1
+
+if [ "$REPO" == "" ]; then
+    REPO="pki-10.6"
+fi
+
+fedpkg copr-build --nowait $REPO

gpl.txt

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

jss-HMAC-test-for-AES-encrypt-unwrap.patch

@@ -1,196 +0,0 @@
-# HG changeset patch
-# User Jack Magne <jmagne@redhat.com>
-# Date 1504307754 25200
-#      Fri Sep 01 16:15:54 2017 -0700
-# Node ID eec15518fd61f1d988c25b4de589555796f9e65f
-# Parent  17d1d7b740ca5777fbcf8ee817a2f26b9c93593a
-unwrapping of HMAC-SHA1 secret keys using AES wrapping and unwrapping
-cfu on behalf of jmagne
-
-diff -r 17d1d7b740ca -r eec15518fd61 org/mozilla/jss/pkcs11/PK11KeyWrapper.java
---- a/org/mozilla/jss/pkcs11/PK11KeyWrapper.java	Mon May 01 10:39:50 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11KeyWrapper.java	Fri Sep 01 16:15:54 2017 -0700
-@@ -588,6 +588,8 @@
-             return EncryptionAlgorithm.RC4;
-         } else if( type == SymmetricKey.AES ) {
-             return EncryptionAlgorithm.AES_128_ECB;
-+        } else if( type == SymmetricKey.SHA1_HMAC) {
-+            return HMACAlgorithm.SHA1;
-         } else  {
-             Assert._assert( type == SymmetricKey.RC2 );
-             return EncryptionAlgorithm.RC2_CBC;
-diff -r 17d1d7b740ca -r eec15518fd61 org/mozilla/jss/pkcs11/PK11MessageDigest.c
---- a/org/mozilla/jss/pkcs11/PK11MessageDigest.c	Mon May 01 10:39:50 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11MessageDigest.c	Fri Sep 01 16:15:54 2017 -0700
-@@ -67,19 +67,19 @@
-     }
- 
-     /* copy the key, setting the CKA_SIGN attribute */
--    /*
-+    
-     newKey = PK11_CopySymKeyForSigning(origKey, mech);
-+
-+    /* For some key on the hsm, this call could fail, but the key may work anyway */
-+
-     if( newKey == NULL ) {
--        JSS_throwMsg(env, DIGEST_EXCEPTION,
--                        "Unable to set CKA_SIGN attribute on symmetric key");
--        goto finish;
-+        newKey = origKey;
-     }
--    */
- 
-     param.data = NULL;
-     param.len = 0;
- 
--    context = PK11_CreateContextBySymKey(mech, CKA_SIGN, origKey, &param);
-+    context = PK11_CreateContextBySymKey(mech, CKA_SIGN, newKey, &param);
-     if( context == NULL ) {
-         JSS_throwMsg(env, DIGEST_EXCEPTION,
-             "Unable to initialize digest context");
-@@ -88,7 +88,7 @@
- 
-     contextObj = JSS_PK11_wrapCipherContextProxy(env, &context);
- finish:
--    if(newKey) {
-+    if(newKey && (newKey != origKey)) {
-         /* SymKeys are ref counted, and the context will free it's ref
-          * when it is destroyed */
-         PK11_FreeSymKey(newKey);
-diff -r 17d1d7b740ca -r eec15518fd61 org/mozilla/jss/tests/HmacTest.java
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/org/mozilla/jss/tests/HmacTest.java	Fri Sep 01 16:15:54 2017 -0700
-@@ -0,0 +1,119 @@
-+
-+package org.mozilla.jss.tests;
-+
-+
-+import java.security.Key;
-+import javax.crypto.Cipher;
-+import javax.crypto.KeyGenerator;
-+import javax.crypto.Mac;
-+import javax.crypto.SecretKey;
-+import javax.crypto.spec.IvParameterSpec;
-+
-+import org.mozilla.jss.CryptoManager;
-+import org.mozilla.jss.crypto.CryptoToken;
-+import org.mozilla.jss.crypto.SymmetricKey;
-+
-+
-+public class HmacTest {
-+
-+  private static final String INTERNAL_KEY_STORAGE_TOKEN =
-+    new CryptoManager.InitializationValues("").getInternalKeyStorageTokenDescription().trim();
-+
-+  private static final String NSS_DATABASE_DIR = "sql:data";
-+  private static final String PROVIDER = "Mozilla-JSS";
-+
-+
-+  public static void main(String[] args)
-+   {
-+
-+    String algorithm = "hmac-sha1";
-+
-+    try {
-+       configureCrypto(args);
-+
-+       Mac mac = Mac.getInstance(algorithm, PROVIDER);
-+
-+       byte[] keyData = new byte[16];
-+       Key key = importHmacSha1Key(keyData);
-+
-+       mac.init(key);
-+
-+       doHMAC(mac,"Dogtag rules!");
-+
-+       System.out.println("Done");
-+
-+       System.exit(0);
-+    } catch (Exception e) {
-+        System.exit(1);
-+    }
-+  }
-+
-+  private static void configureCrypto(String[] args)
-+    throws Exception {
-+
-+    CryptoManager.InitializationValues initializationValues =
-+      new CryptoManager.InitializationValues(args[0]);
-+
-+    CryptoManager.initialize(initializationValues);
-+
-+    CryptoManager cryptoManager = CryptoManager.getInstance();
-+
-+    CryptoToken cryptoToken =
-+      cryptoManager.getTokenByName(INTERNAL_KEY_STORAGE_TOKEN);
-+
-+    cryptoManager.setThreadToken(cryptoToken);
-+  }
-+
-+  private static Key importHmacSha1Key(byte[] key)
-+    throws Exception {
-+
-+    final String WRAPPING_ALGORITHM = "AES/CBC/PKCS5Padding";
-+
-+    Key wrappingKey = getWrappingKey();
-+
-+    byte[] iv = new byte[16];
-+    IvParameterSpec ivParameterSpec = new IvParameterSpec(iv);
-+
-+    Cipher wrappingCipher = Cipher.getInstance(WRAPPING_ALGORITHM, PROVIDER);
-+    wrappingCipher.init(Cipher.ENCRYPT_MODE, wrappingKey, ivParameterSpec);
-+
-+    byte[] wrappedKeyData = wrappingCipher.doFinal(key);
-+
-+    Cipher unwrappingCipher = Cipher.getInstance(WRAPPING_ALGORITHM, PROVIDER);
-+    unwrappingCipher.init(Cipher.UNWRAP_MODE, wrappingKey, ivParameterSpec);
-+
-+    return (SecretKey) unwrappingCipher.unwrap(wrappedKeyData,
-+                                               SymmetricKey.SHA1_HMAC.toString(),
-+                                               Cipher.SECRET_KEY);
-+  }
-+
-+  private static synchronized Key getWrappingKey()
-+    throws Exception {
-+
-+    final String keyGenAlgorithm = "AES";
-+    final int wrappingKeyLength = 256;
-+
-+    KeyGenerator keyGen = KeyGenerator.getInstance(keyGenAlgorithm, PROVIDER);
-+    keyGen.init(wrappingKeyLength);
-+    return keyGen.generateKey();
-+  }
-+
-+  public static void doHMAC(Mac mozillaHmac, String clearText)
-+            throws Exception {
-+        byte[] mozillaHmacOut;
-+
-+        //Get the Mozilla HMAC
-+        mozillaHmacOut = mozillaHmac.doFinal(clearText.getBytes());
-+
-+        if (mozillaHmacOut.length == mozillaHmac.getMacLength()) {
-+            System.out.println(PROVIDER + " supports " +
-+                    mozillaHmac.getAlgorithm() + "  and the output size is " + mozillaHmac.getMacLength());
-+        } else {
-+            throw new Exception("ERROR: hmac output size is " +
-+                    mozillaHmacOut.length + ", should be " +
-+                    mozillaHmac.getMacLength());
-+        }
-+    }
-+
-+
-+}
-diff -r 17d1d7b740ca -r eec15518fd61 org/mozilla/jss/tests/all.pl
---- a/org/mozilla/jss/tests/all.pl	Mon May 01 10:39:50 2017 -0700
-+++ b/org/mozilla/jss/tests/all.pl	Fri Sep 01 16:15:54 2017 -0700
-@@ -492,6 +492,10 @@
- $command = "$java -cp $jss_classpath org.mozilla.jss.tests.HMACTest $testdir $pwfile";
- run_test($testname, $command);
- 
-+$testname = "HMAC Unwrap";
-+$command = "$java -cp $jss_classpath org.mozilla.jss.tests.HmacTest $testdir $pwfile";
-+run_test($testname, $command);
-+
- $testname = "KeyWrapping ";
- $command = "$java -cp $jss_classpath org.mozilla.jss.tests.JCAKeyWrap $testdir $pwfile";
- run_test($testname, $command);

jss-HMAC-unwrap-keywrap-FIPSMODE.patch

@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Jack Magne <jmagne@redhat.com>
-# Date 1506640850 25200
-#      Thu Sep 28 16:20:50 2017 -0700
-# Node ID 252c10f448971b7ae087bde259505abd5dc5a03a
-# Parent  3e9a5ae2149d04877dc19b117a8917c22854f8eb
-Fix: Bug 1400884 - new JSS failures: HMAC Unwrap and KeyWrapping FIPSMODE.
-
-diff --git a/org/mozilla/jss/pkcs11/KeyType.java b/org/mozilla/jss/pkcs11/KeyType.java
---- a/org/mozilla/jss/pkcs11/KeyType.java
-+++ b/org/mozilla/jss/pkcs11/KeyType.java
-@@ -204,9 +204,7 @@
-                             EncryptionAlgorithm.AES_192_CBC,
-                             EncryptionAlgorithm.AES_256_ECB,
-                             EncryptionAlgorithm.AES_256_CBC,
--                            /* AES CBC PAD is the same as AES_256_CBC_PAD */
--                            /* shouldn't break backward compatibility 313798*/        
--                            //EncryptionAlgorithm.AES_CBC_PAD, 
-+                            EncryptionAlgorithm.AES_CBC_PAD, 
-                             EncryptionAlgorithm.AES_128_CBC_PAD,
-                             EncryptionAlgorithm.AES_192_CBC_PAD,
-                             EncryptionAlgorithm.AES_256_CBC_PAD        

jss-ObjectNotFoundException-message.patch

@@ -1,680 +0,0 @@
-# HG changeset patch
-# User "Endi S. Dewata" <edewata@redhat.com>
-# Date 1509154719 -7200
-#      Sat Oct 28 03:38:39 2017 +0200
-# Node ID 19a0e2146a929173757e6ccbb61a035ec9426f43
-# Parent  b1a3c3cc6b3584948d251d3bfcfe6630d8970db5
-Added certificate nickname into ObjectNotFoundException message.
-The code that generates ObjectNotFoundException has been modified
-to include the certificate nickname to help troubleshooting.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1408057
-
-diff --git a/org/mozilla/jss/PK11Finder.c b/org/mozilla/jss/PK11Finder.c
---- a/org/mozilla/jss/PK11Finder.c
-+++ b/org/mozilla/jss/PK11Finder.c
-@@ -54,7 +54,9 @@
-     cert = JSS_PK11_findCertAndSlotFromNickname(nick, NULL, &slot);
- 
-     if(cert == NULL) {
--        JSS_nativeThrow(env, OBJECT_NOT_FOUND_EXCEPTION);
-+        char *message = PR_smprintf("Certificate not found: %s", nick);
-+        JSS_throwMsg(env, OBJECT_NOT_FOUND_EXCEPTION, message);
-+        PR_smprintf_free(message);
-         goto finish;
-     }
- 
-@@ -1577,7 +1579,9 @@
-     cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), nickname);
- 
-     if (cert == NULL) {
--        JSS_throw(env, OBJECT_NOT_FOUND_EXCEPTION);
-+        char *message = PR_smprintf("Certificate not found: %s", nickname);
-+        JSS_throwMsg(env, OBJECT_NOT_FOUND_EXCEPTION, message);
-+        PR_smprintf_free(message);
-         goto finish;
-     } else {
-     /* 0 for certificateUsage in call to CERT_VerifyCertificateNow will
-@@ -1640,7 +1644,9 @@
-     cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), nickname);
- 
-     if (cert == NULL) {
--        JSS_throw(env, OBJECT_NOT_FOUND_EXCEPTION);
-+        char *message = PR_smprintf("Certificate not found: %s", nickname);
-+        JSS_throwMsg(env, OBJECT_NOT_FOUND_EXCEPTION, message);
-+        PR_smprintf_free(message);
-         goto finish;
-     } else {
-     /* 0 for certificateUsage in call to CERT_VerifyCertificateNow to
-@@ -1801,7 +1807,9 @@
-     cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), nickname);
- 
-     if (cert == NULL) {
--        JSS_throw(env, OBJECT_NOT_FOUND_EXCEPTION);
-+        char *message = PR_smprintf("Certificate not found: %s", nickname);
-+        JSS_throwMsg(env, OBJECT_NOT_FOUND_EXCEPTION, message);
-+        PR_smprintf_free(message);
-         goto finish;
-     } else {
-         rv = CERT_VerifyCertNow(CERT_GetDefaultCertDB(), cert,
-# HG changeset patch
-# User "Endi S. Dewata" <edewata@redhat.com>
-# Date 1509154819 -7200
-#      Sat Oct 28 03:40:19 2017 +0200
-# Node ID 837c79476110ecd4bf6b507faad50edb9eed7e7e
-# Parent  19a0e2146a929173757e6ccbb61a035ec9426f43
-Reformatted SocketBase.java.
-The SocketBase.java has been auto-formatted using Eclipse to
-simplify further changes on the file.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1408057
-
-diff --git a/org/mozilla/jss/ssl/SocketBase.java b/org/mozilla/jss/ssl/SocketBase.java
---- a/org/mozilla/jss/ssl/SocketBase.java
-+++ b/org/mozilla/jss/ssl/SocketBase.java
-@@ -27,6 +27,7 @@
-     int getTimeout() {
-         return timeout;
-     }
-+
-     void setTimeout(int timeout) {
-         this.timeout = timeout;
-     }
-@@ -36,18 +37,17 @@
-     }
- 
-     native byte[] socketCreate(Object socketObject,
--        SSLCertificateApprovalCallback certApprovalCallback,
--        SSLClientCertificateSelectionCallback clientCertSelectionCallback,
--        java.net.Socket javaSock, String host,int family)
-+            SSLCertificateApprovalCallback certApprovalCallback,
-+            SSLClientCertificateSelectionCallback clientCertSelectionCallback,
-+            java.net.Socket javaSock, String host, int family)
-             throws SocketException;
- 
-     byte[] socketCreate(Object socketObject,
--        SSLCertificateApprovalCallback certApprovalCallback,
--        SSLClientCertificateSelectionCallback clientCertSelectionCallback, int family)
--            throws SocketException
--    {
-+            SSLCertificateApprovalCallback certApprovalCallback,
-+            SSLClientCertificateSelectionCallback clientCertSelectionCallback, int family)
-+            throws SocketException {
-         return socketCreate(socketObject, certApprovalCallback,
--            clientCertSelectionCallback, null, null, family);
-+                clientCertSelectionCallback, null, null, family);
-     }
- 
-     native void socketBind(byte[] addrBA, int port) throws SocketException;
-@@ -57,7 +57,7 @@
-      * safer than copying the values of the C constants, which are subject
-      * to change, into Java code.
-      * Note to developer these constants are not all related! i.e. you cannot
--     * pass in PR_SHUTDOWN_RCV to setSSLOption etc! Check their usage 
-+     * pass in PR_SHUTDOWN_RCV to setSSLOption etc! Check their usage
-      * in NSS and NSPR before using.
-      */
-     static final int SSL_ENABLE_SSL2 = 0;
-@@ -73,7 +73,7 @@
-     static final int SSL_POLICY_DOMESTIC = 10;
-     static final int SSL_POLICY_EXPORT = 11;
-     static final int SSL_POLICY_FRANCE = 12;
--    static final int SSL_ROLLBACK_DETECTION = 13; 
-+    static final int SSL_ROLLBACK_DETECTION = 13;
-     static final int SSL_NO_STEP_DOWN = 14;
-     static final int SSL_ENABLE_FDX = 15;
-     static final int SSL_V2_COMPATIBLE_HELLO = 16;
-@@ -98,7 +98,7 @@
-     static final int SSL_Variant_Stream = 33;
-     static final int SSL_Variant_Datagram = 34;
- 
--    static final int SSL_AF_INET  = 50;
-+    static final int SSL_AF_INET = 50;
-     static final int SSL_AF_INET6 = 51;
- 
-     void close() throws IOException {
-@@ -106,7 +106,7 @@
-     }
- 
-     // SSLServerSocket and SSLSocket close methods
--    // have their own synchronization control that 
-+    // have their own synchronization control that
-     // protects SocketBase.socketClose.
-     native void socketClose() throws IOException;
- 
-@@ -118,14 +118,13 @@
-     }
- 
-     public void requestClientAuthNoExpiryCheck(boolean b)
--        throws SocketException
--    {
-+            throws SocketException {
-         requestingClientAuth = b;
-         requestClientAuthNoExpiryCheckNative(b);
-     }
- 
-     private native void requestClientAuthNoExpiryCheckNative(boolean b)
--        throws SocketException;
-+            throws SocketException;
- 
-     void enableSSL2(boolean enable) throws SocketException {
-         setSSLOption(SSL_ENABLE_SSL2, enable);
-@@ -144,8 +143,7 @@
-     }
- 
-     void enableRenegotiation(int mode)
--            throws SocketException
--    {
-+            throws SocketException {
-         setSSLOptionMode(SocketBase.SSL_ENABLE_RENEGOTIATION, mode);
-     }
- 
-@@ -168,23 +166,21 @@
-     void enableV2CompatibleHello(boolean enable) throws SocketException {
-         setSSLOption(SSL_V2_COMPATIBLE_HELLO, enable);
-     }
--    
-+
-     void setSSLOption(int option, boolean on)
--        throws SocketException
--    {
-+            throws SocketException {
-         setSSLOption(option, on ? 1 : 0);
-     }
- 
--    /** 
--     * Sets SSL options for this socket that have simple 
-+    /**
-+     * Sets SSL options for this socket that have simple
-      * enable/disable values.
-      */
-     native void setSSLOption(int option, int on)
--        throws SocketException;
-+            throws SocketException;
- 
-     void setSSLVersionRange(org.mozilla.jss.ssl.SSLSocket.SSLVersionRange range)
--        throws SocketException
--    {
-+            throws SocketException {
-         setSSLVersionRange(range.getMinEnum(), range.getMaxEnum());
-     }
- 
-@@ -192,93 +188,101 @@
-      * Sets SSL Version Range for this socket to support TLS v1.1 and v1.2
-      */
-     native void setSSLVersionRange(int min, int max)
--        throws SocketException;
-+            throws SocketException;
- 
--    /** 
-+    /**
-      * Sets the SSL option setting mode value use for options
-      * that have more values than just enable/disable.
-      */
-     native void setSSLOptionMode(int option, int option2)
--        throws SocketException; 
-+            throws SocketException;
- 
--    
-     /* return 0 for option disabled 1 for option enabled. */
-     native int getSSLOption(int option)
--        throws SocketException;
--    
-+            throws SocketException;
-+
-     public String getSSLOptions() {
-         StringBuffer buf = new StringBuffer();
-         try {
-             buf.append("SSL Options configured for this SSLSocket:");
--            buf.append("\nSSL_ENABLE_SSL2" + 
--                ((getSSLOption(SocketBase.SSL_ENABLE_SSL2) != 0)
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_ENABLE_SSL3"  + 
--                ((getSSLOption(SocketBase.SSL_ENABLE_SSL3) != 0) 
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_ENABLE_TLS"  + 
--                ((getSSLOption(SocketBase.SSL_ENABLE_TLS) != 0) 
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_REQUIRE_CERTIFICATE"); 
-+            buf.append("\nSSL_ENABLE_SSL2" +
-+                    ((getSSLOption(SocketBase.SSL_ENABLE_SSL2) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_ENABLE_SSL3" +
-+                    ((getSSLOption(SocketBase.SSL_ENABLE_SSL3) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_ENABLE_TLS" +
-+                    ((getSSLOption(SocketBase.SSL_ENABLE_TLS) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_REQUIRE_CERTIFICATE");
-             switch (getSSLOption(SocketBase.SSL_REQUIRE_CERTIFICATE)) {
--                case 0:
--                    buf.append("=Never");
--                    break;
--                case 1:
--                    buf.append("=Always");
--                    break;
--                case 2:
--                    buf.append("=First Handshake");
--                    break;
--                case 3:
--                    buf.append("=No Error");
--                    break;
--                default:
--                    buf.append("=Report JSS Bug this option has a status.");
--                    break;
-+            case 0:
-+                buf.append("=Never");
-+                break;
-+            case 1:
-+                buf.append("=Always");
-+                break;
-+            case 2:
-+                buf.append("=First Handshake");
-+                break;
-+            case 3:
-+                buf.append("=No Error");
-+                break;
-+            default:
-+                buf.append("=Report JSS Bug this option has a status.");
-+                break;
-             } //end switch
--            buf.append("\nSSL_REQUEST_CERTIFICATE"  + 
--                ((getSSLOption(SocketBase.SSL_REQUEST_CERTIFICATE) != 0) 
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_NO_CACHE"  + 
--                ((getSSLOption(SocketBase.SSL_NO_CACHE) != 0)
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_ROLLBACK_DETECTION"  + 
--                ((getSSLOption(SocketBase.SSL_ROLLBACK_DETECTION) != 0)
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_NO_STEP_DOWN"  + 
--                ((getSSLOption(SocketBase.SSL_NO_STEP_DOWN) != 0)
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_ENABLE_FDX"  + 
--                ((getSSLOption(SocketBase.SSL_ENABLE_FDX) != 0)
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_V2_COMPATIBLE_HELLO"  + 
--                ((getSSLOption(SocketBase.SSL_V2_COMPATIBLE_HELLO) != 0) 
--                ? "=on" :  "=off"));
--            buf.append("\nSSL_ENABLE_SESSION_TICKETS"  +
--                ((getSSLOption(SocketBase.SSL_ENABLE_SESSION_TICKETS)
--                != 0) ? "=on" :  "=off"));
-+            buf.append("\nSSL_REQUEST_CERTIFICATE" +
-+                    ((getSSLOption(SocketBase.SSL_REQUEST_CERTIFICATE) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_NO_CACHE" +
-+                    ((getSSLOption(SocketBase.SSL_NO_CACHE) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_ROLLBACK_DETECTION" +
-+                    ((getSSLOption(SocketBase.SSL_ROLLBACK_DETECTION) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_NO_STEP_DOWN" +
-+                    ((getSSLOption(SocketBase.SSL_NO_STEP_DOWN) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_ENABLE_FDX" +
-+                    ((getSSLOption(SocketBase.SSL_ENABLE_FDX) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_V2_COMPATIBLE_HELLO" +
-+                    ((getSSLOption(SocketBase.SSL_V2_COMPATIBLE_HELLO) != 0)
-+                            ? "=on"
-+                            : "=off"));
-+            buf.append("\nSSL_ENABLE_SESSION_TICKETS" +
-+                    ((getSSLOption(SocketBase.SSL_ENABLE_SESSION_TICKETS) != 0) ? "=on" : "=off"));
-             buf.append("\nSSL_ENABLE_RENEGOTIATION");
-             switch (getSSLOption(SocketBase.SSL_ENABLE_RENEGOTIATION)) {
--                case 0:
--                    buf.append("=SSL_RENEGOTIATE_NEVER");
--                    break;
--                case 1:
--                    buf.append("=SSL_RENEGOTIATE_UNRESTRICTED");
--                    break;
--                case 2:
--                    buf.append("=SSL_RENEGOTIATE_REQUIRES_XTN");
--                    break;
--                case 3:
--                    buf.append("=SSL_RENEGOTIATE_TRANSITIONAL");
--                    break;
--                default:
--                    buf.append("=Report JSS Bug this option has a status.");
--                    break;
-+            case 0:
-+                buf.append("=SSL_RENEGOTIATE_NEVER");
-+                break;
-+            case 1:
-+                buf.append("=SSL_RENEGOTIATE_UNRESTRICTED");
-+                break;
-+            case 2:
-+                buf.append("=SSL_RENEGOTIATE_REQUIRES_XTN");
-+                break;
-+            case 3:
-+                buf.append("=SSL_RENEGOTIATE_TRANSITIONAL");
-+                break;
-+            default:
-+                buf.append("=Report JSS Bug this option has a status.");
-+                break;
-             } //end switch
--            buf.append("\nSSL_REQUIRE_SAFE_NEGOTIATION"  +
--                ((getSSLOption(SocketBase.SSL_REQUIRE_SAFE_NEGOTIATION) != 0)
--                ? "=on" :  "=off"));
-+            buf.append("\nSSL_REQUIRE_SAFE_NEGOTIATION" +
-+                    ((getSSLOption(SocketBase.SSL_REQUIRE_SAFE_NEGOTIATION) != 0)
-+                            ? "=on"
-+                            : "=off"));
- 
-         } catch (SocketException e) {
-             buf.append("\ngetSSLOptions exception " + e.getMessage());
-@@ -292,19 +296,18 @@
-      * of construction than getByName(), and it is final.
-      *
-      * @return The InetAddress corresponding to the given integer,
--     *      or <tt>null</tt> if the InetAddress could not be constructed.
-+     *         or <tt>null</tt> if the InetAddress could not be constructed.
-      */
--    private static InetAddress
--    convertIntToInetAddress(int intAddr) {
-+    private static InetAddress convertIntToInetAddress(int intAddr) {
-         InetAddress in;
-         int[] addr = new int[4];
-         addr[0] = ((intAddr >>> 24) & 0xff);
-         addr[1] = ((intAddr >>> 16) & 0xff);
--        addr[2] = ((intAddr >>>  8) & 0xff);
--        addr[3] = ((intAddr       ) & 0xff);
-+        addr[2] = ((intAddr >>> 8) & 0xff);
-+        addr[3] = ((intAddr) & 0xff);
-         try {
-             in = InetAddress.getByName(
--                addr[0] + "." + addr[1] + "." + addr[2] + "." + addr[3] );
-+                    addr[0] + "." + addr[1] + "." + addr[2] + "." + addr[3]);
-         } catch (java.net.UnknownHostException e) {
-             in = null;
-         }
-@@ -312,12 +315,13 @@
-     }
- 
-     private native byte[] getLocalAddressByteArrayNative() throws SocketException;
-+
-     private native byte[] getPeerAddressByteArrayNative() throws SocketException;
-+
-     /**
-      * @return the InetAddress of the peer end of the socket.
-      */
--    InetAddress getInetAddress()
--    {
-+    InetAddress getInetAddress() {
-         try {
-             byte[] address = getPeerAddressByteArrayNative();
- 
-@@ -326,14 +330,15 @@
-             try {
- 
-                 iAddr = InetAddress.getByAddress(address);
--            }   catch(UnknownHostException e) {
-+            } catch (UnknownHostException e) {
-             }
- 
-             return iAddr;
--        } catch(SocketException e) {
-+        } catch (SocketException e) {
-             return null;
-         }
-     }
-+
-     private native int getPeerAddressNative() throws SocketException;
- 
-     /**
-@@ -348,20 +353,21 @@
-             try {
- 
-                 lAddr = InetAddress.getByAddress(address);
--            }   catch(UnknownHostException e) {
-+            } catch (UnknownHostException e) {
-             }
- 
-             return lAddr;
--        } catch(SocketException e) {
-+        } catch (SocketException e) {
-             return null;
-         }
-     }
-+
-     private native int getLocalAddressNative() throws SocketException;
- 
-     public int getLocalPort() {
-         try {
-             return getLocalPortNative();
--        } catch(SocketException e) {
-+        } catch (SocketException e) {
-             return 0;
-         }
-     }
-@@ -369,18 +375,16 @@
-     private native int getLocalPortNative() throws SocketException;
- 
-     void requireClientAuth(boolean require, boolean onRedo)
--            throws SocketException
--    {
--        if( require && !requestingClientAuth ) {
-+            throws SocketException {
-+        if (require && !requestingClientAuth) {
-             requestClientAuth(true);
-         }
-         setSSLOption(SSL_REQUIRE_CERTIFICATE, require ? (onRedo ? 1 : 2) : 0);
-     }
- 
-     void requireClientAuth(int mode)
--            throws SocketException
--    {
--        if(mode > 0 && !requestingClientAuth ) {
-+            throws SocketException {
-+        if (mode > 0 && !requestingClientAuth) {
-             requestClientAuth(true);
-         }
-         setSSLOptionMode(SocketBase.SSL_REQUIRE_CERTIFICATE, mode);
-@@ -390,52 +394,52 @@
-      * Sets the nickname of the certificate to use for client authentication.
-      */
-     public void setClientCertNickname(String nick) throws SocketException {
--      try {
--        setClientCert( CryptoManager.getInstance().findCertByNickname(nick) );
--      } catch(CryptoManager.NotInitializedException nie) {
--        throw new SocketException("CryptoManager not initialized");
--      } catch(ObjectNotFoundException onfe) {
--        throw new SocketException("Object not found: " + onfe);
--      } catch(TokenException te) {
--        throw new SocketException("Token Exception: " + te);
--      }
-+        try {
-+            setClientCert(CryptoManager.getInstance().findCertByNickname(nick));
-+        } catch (CryptoManager.NotInitializedException nie) {
-+            throw new SocketException("CryptoManager not initialized");
-+        } catch (ObjectNotFoundException onfe) {
-+            throw new SocketException("Object not found: " + onfe);
-+        } catch (TokenException te) {
-+            throw new SocketException("Token Exception: " + te);
-+        }
-     }
- 
-     native void setClientCert(org.mozilla.jss.crypto.X509Certificate cert)
--        throws SocketException;
-+            throws SocketException;
- 
-     void useCache(boolean b) throws SocketException {
-         setSSLOption(SSL_NO_CACHE, !b);
-     }
- 
-     static Throwable processExceptions(Throwable topException,
--        Throwable bottomException)
--    {
--      try {
--        StringBuffer strBuf;
--        strBuf = new StringBuffer( topException.toString() );
-+            Throwable bottomException) {
-+        try {
-+            StringBuffer strBuf;
-+            strBuf = new StringBuffer(topException.toString());
- 
--        if( bottomException != null ) {
--            strBuf.append(" --> ");
--            strBuf.append( bottomException.toString() );
-+            if (bottomException != null) {
-+                strBuf.append(" --> ");
-+                strBuf.append(bottomException.toString());
-+            }
-+
-+            Class excepClass = topException.getClass();
-+            Class stringClass = java.lang.String.class;
-+            Constructor cons = excepClass.getConstructor(new Class[] { stringClass });
-+
-+            return (Throwable) cons.newInstance(new Object[] { strBuf.toString() });
-+        } catch (Exception e) {
-+            Assert.notReached("Problem constructing exception container");
-+            return topException;
-         }
--
--        Class excepClass = topException.getClass();
--        Class stringClass = java.lang.String.class;
--        Constructor cons = excepClass.getConstructor(new Class[] {stringClass});
--
--        return (Throwable) cons.newInstance(new Object[] { strBuf.toString() });
--      } catch(Exception e ) {
--        Assert.notReached("Problem constructing exception container");
--        return topException;
--      }
-     }
- 
-     static private int supportsIPV6 = -1;
-+
-     static boolean supportsIPV6() {
- 
--        if(supportsIPV6 >= 0) {
--            if(supportsIPV6 > 0) {
-+        if (supportsIPV6 >= 0) {
-+            if (supportsIPV6 > 0) {
-                 return true;
-             } else {
-                 return false;
-@@ -444,28 +448,25 @@
- 
-         Enumeration netInter;
-         try {
--                 netInter = NetworkInterface.getNetworkInterfaces();
--        }  catch (SocketException e) {
-+            netInter = NetworkInterface.getNetworkInterfaces();
-+        } catch (SocketException e) {
- 
--                 return false;
-+            return false;
-         }
--        while ( netInter.hasMoreElements() )
--        {
--            NetworkInterface ni = (NetworkInterface)netInter.nextElement();
-+        while (netInter.hasMoreElements()) {
-+            NetworkInterface ni = (NetworkInterface) netInter.nextElement();
-             Enumeration addrs = ni.getInetAddresses();
--            while ( addrs.hasMoreElements() )
--            {
--                 Object o = addrs.nextElement();
--                 if ( o.getClass() == InetAddress.class ||
--                     o.getClass() == Inet4Address.class ||
--                     o.getClass() == Inet6Address.class )
--                 {
--                      InetAddress iaddr = (InetAddress) o;
--                      if(o.getClass() == Inet6Address.class) {
--                          supportsIPV6 = 1;
--                          return true;
--                      }
--                 }
-+            while (addrs.hasMoreElements()) {
-+                Object o = addrs.nextElement();
-+                if (o.getClass() == InetAddress.class ||
-+                        o.getClass() == Inet4Address.class ||
-+                        o.getClass() == Inet6Address.class) {
-+                    InetAddress iaddr = (InetAddress) o;
-+                    if (o.getClass() == Inet6Address.class) {
-+                        supportsIPV6 = 1;
-+                        return true;
-+                    }
-+                }
-             }
-         }
-         supportsIPV6 = 0;
-# HG changeset patch
-# User "Endi S. Dewata" <edewata@redhat.com>
-# Date 1509154824 -7200
-#      Sat Oct 28 03:40:24 2017 +0200
-# Node ID ca2c2fcfaf207f87c3c69e493f2b30fd0a088e95
-# Parent  837c79476110ecd4bf6b507faad50edb9eed7e7e
-Fixed SocketBase.setClientCertNickname() exception handling.
-Previously the SocketBase.setClientCertNickname() would catch
-the original exception and throw a SocketException instead.
-The original stack trace was lost since SocketException does not
-support chaining.
-
-The code has been modified to throw a RuntimeException instead
-and chain the original exception. This way the original stack
-trace can be preserved to help troubleshooting.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1408057
-
-diff --git a/org/mozilla/jss/ssl/SocketBase.java b/org/mozilla/jss/ssl/SocketBase.java
---- a/org/mozilla/jss/ssl/SocketBase.java
-+++ b/org/mozilla/jss/ssl/SocketBase.java
-@@ -4,17 +4,21 @@
- 
- package org.mozilla.jss.ssl;
- 
--import java.net.*;
-+import java.io.IOException;
-+import java.lang.reflect.Constructor;
-+import java.net.Inet4Address;
-+import java.net.Inet6Address;
-+import java.net.InetAddress;
-+import java.net.NetworkInterface;
- import java.net.SocketException;
--import java.io.*;
--import java.io.IOException;
--import java.util.Vector;
-+import java.net.UnknownHostException;
- import java.util.Enumeration;
--import java.lang.reflect.Constructor;
--import org.mozilla.jss.util.Assert;
-+
- import org.mozilla.jss.CryptoManager;
- import org.mozilla.jss.crypto.ObjectNotFoundException;
- import org.mozilla.jss.crypto.TokenException;
-+import org.mozilla.jss.crypto.X509Certificate;
-+import org.mozilla.jss.util.Assert;
- 
- class SocketBase {
- 
-@@ -395,13 +399,18 @@
-      */
-     public void setClientCertNickname(String nick) throws SocketException {
-         try {
--            setClientCert(CryptoManager.getInstance().findCertByNickname(nick));
-+            CryptoManager cm = CryptoManager.getInstance();
-+            X509Certificate cert = cm.findCertByNickname(nick);
-+            setClientCert(cert);
-+
-         } catch (CryptoManager.NotInitializedException nie) {
--            throw new SocketException("CryptoManager not initialized");
-+            throw new RuntimeException(nie);
-+
-         } catch (ObjectNotFoundException onfe) {
--            throw new SocketException("Object not found: " + onfe);
-+            throw new RuntimeException(onfe);
-+
-         } catch (TokenException te) {
--            throw new SocketException("Token Exception: " + te);
-+            throw new RuntimeException(te);
-         }
-     }
- 

jss-PBE-padded-block-cipher-enhancements.patch

@@ -1,620 +0,0 @@
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504894163 25200
-#      Fri Sep 08 11:09:23 2017 -0700
-# Node ID 3629b598a9ce73e83c7896407e3ca820f6383750
-# Parent  eec15518fd61f1d988c25b4de589555796f9e65f
-Bug 1370778 PBE and padded block cipher enhancements and fixes -
-  patch jss-ftweedal-0006-PBEKeyGenParams-allow-specifying-encryption-algorith.patch
-
-Allow specifying an target encryption algorithm in PBEKeyGenParams;
- if the PBE algorithm does not imply a particular cipher, this is needed
- to determine the size of the key to generate
-
-cfu for ftweedale
-
-diff -r eec15518fd61 -r 3629b598a9ce org/mozilla/jss/crypto/PBEKeyGenParams.java
---- a/org/mozilla/jss/crypto/PBEKeyGenParams.java	Fri Sep 01 16:15:54 2017 -0700
-+++ b/org/mozilla/jss/crypto/PBEKeyGenParams.java	Fri Sep 08 11:09:23 2017 -0700
-@@ -13,6 +13,7 @@
-     private Password pass;
-     private byte[] salt;
-     private int iterations;
-+    private EncryptionAlgorithm encryptionAlgorithm = EncryptionAlgorithm.DES3_CBC;
- 
-     private PBEKeyGenParams() { }
- 
-@@ -40,7 +41,8 @@
-     }
- 
-     /**
--     * Creates PBE parameters.
-+     * Creates PBE parameters using default encryption algorithm
-+     * (DES3_EDE3_CBC).
-      *
-      * @param pass The password. It will be cloned, so the
-      *      caller is still responsible for clearing it. It must not be null.
-@@ -60,6 +62,33 @@
-     }
- 
-     /**
-+     * Creates PBE parameters using default encryption algorithm
-+     * (DES3_EDE3_CBC).
-+     *
-+     * @param pass The password. It will be cloned, so the
-+     *      caller is still responsible for clearing it. It must not be null.
-+     * @param salt The salt for the PBE algorithm. Will <b>not</b> be cloned.
-+     *      Must not be null. It is the responsibility of the caller to
-+     *      use the right salt length for the algorithm. Most algorithms
-+     *      use 8 bytes of salt.
-+     * @param iterations The iteration count for the PBE algorithm.
-+     * @param encAlg The encryption algorithm.  This is used with SOME
-+     *      PBE algorithms for determining the KDF output length.
-+     */
-+    public PBEKeyGenParams(
-+            char[] pass, byte[] salt, int iterations,
-+            EncryptionAlgorithm encAlg) {
-+        if (pass == null || salt == null) {
-+            throw new NullPointerException();
-+        }
-+        this.pass = new Password((char[]) pass.clone());
-+        this.salt = salt;
-+        this.iterations = iterations;
-+        if (encAlg != null)
-+            this.encryptionAlgorithm = encAlg;
-+    }
-+
-+    /**
-      * Returns a <b>reference</b> to the password, not a copy.
-      */
-     public Password getPassword() {
-@@ -81,6 +110,14 @@
-     }
- 
-     /**
-+     * The encryption algorithm is used with SOME PBE algorithms for
-+     * determining the KDF output length.
-+     */
-+    public EncryptionAlgorithm getEncryptionAlgorithm() {
-+        return encryptionAlgorithm;
-+    }
-+
-+    /**
-      * Clears the password. This should be called when this object is no
-      * longer needed so the password is not left around in memory.
-      */
-diff -r eec15518fd61 -r 3629b598a9ce org/mozilla/jss/pkcs11/PK11KeyGenerator.c
---- a/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	Fri Sep 01 16:15:54 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11KeyGenerator.c	Fri Sep 08 11:09:23 2017 -0700
-@@ -246,9 +246,9 @@
-  *
-  */
- JNIEXPORT jobject JNICALL
--Java_org_mozilla_jss_pkcs11_PK11KeyGenerator_generatePBE
--    (JNIEnv *env, jclass clazz, jobject token, jobject alg, jbyteArray passBA,
--    jbyteArray saltBA, jint iterationCount)
-+Java_org_mozilla_jss_pkcs11_PK11KeyGenerator_generatePBE(
-+    JNIEnv *env, jclass clazz, jobject token, jobject alg, jobject encAlg,
-+    jbyteArray passBA, jbyteArray saltBA, jint iterationCount)
- {
-     PK11SlotInfo *slot=NULL;
-     PK11SymKey *skey=NULL;
-@@ -299,12 +299,15 @@
-         oidTag = JSS_getOidTagFromAlg(env, alg);
-         PR_ASSERT(oidTag != SEC_OID_UNKNOWN);
- 
-+        SECOidTag encAlgOidTag = JSS_getOidTagFromAlg(env, encAlg);
-+        PR_ASSERT(encAlgOidTag != SEC_OID_UNKNOWN);
-+
-         /* create algid */
-         algid = PK11_CreatePBEV2AlgorithmID(
-             oidTag,
--            SEC_OID_DES_EDE3_CBC,
-+            encAlgOidTag,
-             SEC_OID_HMAC_SHA1,
--            168/8,
-+            0,
-             iterationCount,
-             salt);
- 
-diff -r eec15518fd61 -r 3629b598a9ce org/mozilla/jss/pkcs11/PK11KeyGenerator.java
---- a/org/mozilla/jss/pkcs11/PK11KeyGenerator.java	Fri Sep 01 16:15:54 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11KeyGenerator.java	Fri Sep 08 11:09:23 2017 -0700
-@@ -178,8 +178,9 @@
-             byte[] pwbytes=null;
-             try {
-                 pwbytes = charToByte.convert( kgp.getPassword().getChars() );
--                return generatePBE(token, algorithm, pwbytes,
--                    kgp.getSalt(), kgp.getIterations());
-+                return generatePBE(
-+                    token, algorithm, kgp.getEncryptionAlgorithm(),
-+                    pwbytes, kgp.getSalt(), kgp.getIterations());
-             } finally {
-                 if( pwbytes!=null ) {
-                     Password.wipeBytes(pwbytes);
-@@ -296,7 +297,9 @@
-      *  be null.
-      */
-     private static native SymmetricKey
--    generatePBE(PK11Token token, KeyGenAlgorithm algorithm, byte[] pass,
--        byte[] salt, int iterationCount) throws TokenException;
-+    generatePBE(
-+        PK11Token token, KeyGenAlgorithm algorithm, EncryptionAlgorithm encAlg,
-+        byte[] pass, byte[] salt, int iterationCount)
-+        throws TokenException;
- 
- }
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504894529 25200
-#      Fri Sep 08 11:15:29 2017 -0700
-# Node ID bada1409d2bb67cd92c3b7c292b8bb4ae6388513
-# Parent  3629b598a9ce73e83c7896407e3ca820f6383750
-Bug 1370778 PBE and padded block cipher enhancements and fixes -
-patch jss-ftweedal-0007-Support-the-CKK_GENERIC_SECRET-symmetric-key-type.patch
-Subject: Support the CKK_GENERIC_SECRET symmetric key type
-From: Fraser Tweedale <ftweedal@redhat.com>
-Content-Type: text/plain
-found patch at byte 873
-message:
-Support the CKK_GENERIC_SECRET symmetric key type
-The NSS PBKDF2 generation produces a key with the CKK_GENERIC_SECRET
-key type.  The underlying PKCS #11 object *does* record the intended
-encryption algorithm that was specified when generating the key via
-PK11_PBEKeyGen, but this information is not exposed via the PKCS #11
-interface.  When initialising a cipher, JSS checks the key type
-against the encryption algorithm and fails if they do not match,
-which is always the case with PBKDF2-derived keys.
-
-To work around this problem, properly record the key type for
-CKK_GENERIC_SECRET keys, and update the cipher initialisation key
-type check to always accept such keys.
-
-cfu for ftweedal
-
-diff -r 3629b598a9ce -r bada1409d2bb org/mozilla/jss/pkcs11/KeyType.java
---- a/org/mozilla/jss/pkcs11/KeyType.java	Fri Sep 08 11:09:23 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/KeyType.java	Fri Sep 08 11:15:29 2017 -0700
-@@ -242,4 +242,7 @@
-                             "SHA1_HMAC"
-                         );
- 
-+    static public final KeyType GENERIC_SECRET =
-+        new KeyType(new Algorithm[] { }, "GENERIC_SECRET");
-+
- }
-diff -r 3629b598a9ce -r bada1409d2bb org/mozilla/jss/pkcs11/PK11Cipher.java
---- a/org/mozilla/jss/pkcs11/PK11Cipher.java	Fri Sep 08 11:09:23 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11Cipher.java	Fri Sep 08 11:15:29 2017 -0700
-@@ -243,8 +243,11 @@
-         }
- 
-         try {
--            if( ((PK11SymKey)key).getKeyType() !=
--                    KeyType.getKeyTypeFromAlgorithm(algorithm) ) {
-+            KeyType keyType = ((PK11SymKey) key).getKeyType();
-+            if (
-+                keyType != KeyType.GENERIC_SECRET
-+                && keyType != KeyType.getKeyTypeFromAlgorithm(algorithm)
-+            ) {
-                 throw new InvalidKeyException("Key is not the right type for"+
-                     " this algorithm: " + ((PK11SymKey)key).getKeyType() + ":" + KeyType.getKeyTypeFromAlgorithm(algorithm) +";");
-             }
-diff -r 3629b598a9ce -r bada1409d2bb org/mozilla/jss/pkcs11/PK11SymKey.c
---- a/org/mozilla/jss/pkcs11/PK11SymKey.c	Fri Sep 08 11:09:23 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11SymKey.c	Fri Sep 08 11:15:29 2017 -0700
-@@ -305,6 +305,9 @@
-           case CKK_DES2:
-              typeFieldName = DES3_KEYTYPE_FIELD;
-              break;
-+          case CKK_GENERIC_SECRET:
-+             typeFieldName = GENERIC_SECRET_KEYTYPE_FIELD;
-+             break;
-           default:
-             PR_ASSERT(PR_FALSE);
-             typeFieldName = DES_KEYTYPE_FIELD;
-diff -r 3629b598a9ce -r bada1409d2bb org/mozilla/jss/util/java_ids.h
---- a/org/mozilla/jss/util/java_ids.h	Fri Sep 08 11:09:23 2017 -0700
-+++ b/org/mozilla/jss/util/java_ids.h	Fri Sep 08 11:15:29 2017 -0700
-@@ -87,6 +87,7 @@
- #define RC2_KEYTYPE_FIELD "RC2"
- #define SHA1_HMAC_KEYTYPE_FIELD "SHA1_HMAC"
- #define AES_KEYTYPE_FIELD "AES"
-+#define GENERIC_SECRET_KEYTYPE_FIELD "GENERIC_SECRET"
- 
- /*
-  * NativeProxy
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504894882 25200
-#      Fri Sep 08 11:21:22 2017 -0700
-# Node ID 890216599f21df4c6d07815604aaac526823a892
-# Parent  bada1409d2bb67cd92c3b7c292b8bb4ae6388513
-Bug 1370778 PBE and padded block cipher enhancements and fixes -
-patch jss-ftweedal-0008-PK11Cipher-improve-error-reporting.patch
-Subject: PK11Cipher: improve error reporting
-From: Fraser Tweedale <ftweedal@redhat.com>
-message:
-PK11Cipher: improve error reporting
-
-cfu for ftweedal
-
-diff -r bada1409d2bb -r 890216599f21 org/mozilla/jss/pkcs11/PK11Cipher.c
---- a/org/mozilla/jss/pkcs11/PK11Cipher.c	Fri Sep 08 11:15:29 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11Cipher.c	Fri Sep 08 11:21:22 2017 -0700
-@@ -152,7 +152,9 @@
-     /* do the operation */
-     if( PK11_CipherOp(context, outbuf, (int*)&outlen, outlen,
-             (unsigned char*)inbuf, inlen) != SECSuccess) {
--        JSS_throwMsg(env, TOKEN_EXCEPTION, "Cipher Operation failed");
-+        JSS_throwMsgPrErrArg(
-+            env, TOKEN_EXCEPTION, "Cipher context update failed",
-+            PR_GetError());
-         goto finish;
-     }
-     PR_ASSERT(outlen >= 0);
-@@ -209,7 +211,9 @@
-     /* perform the finalization */
-     status = PK11_DigestFinal(context, outBuf, &newOutLen, outLen);
-     if( (status != SECSuccess) ) {
--        JSS_throwMsg(env, TOKEN_EXCEPTION, "Cipher operation failed on token");
-+        JSS_throwMsgPrErrArg(
-+            env, TOKEN_EXCEPTION, "Cipher context finalization failed",
-+            PR_GetError());
-         goto finish;
-     }
- 
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504895552 25200
-#      Fri Sep 08 11:32:32 2017 -0700
-# Node ID d39e9b373798ea9d6ae7f35089b07143845b210e
-# Parent  890216599f21df4c6d07815604aaac526823a892
-Bug 1370778 PBE and padded block cipher enhancements and fixes -
-patch jss-ftweedal-0009-Update-AES-CBC-PAD-cipher-definitions.patch
-Subject: Update AES-CBC-PAD cipher definitions
-From: Fraser Tweedale <ftweedal@redhat.com>
-message:
-Update AES-CBC-PAD cipher definitions
-The AES_{128,192,256}_CBC_PAD EncryptionAlgorithm definitions declare
-the correct PKCS #11 cipher mechanism and padding, but do not declare
-the relevant OIDs.  They are also unusable as target algorithms in
-PBE key generation because they declare a PK11_MECH instead of a
-SEC_OID_TAG.
-
-Update these algorithms definitions to declare a SEC_OID_TAG instead
-of a PK11_MECH (JSS_getOidTagFromAlg() will still return the correct
-mechanism) and declare the associated OIDs.
-
-cfu for ftweedal
-
-diff -r 890216599f21 -r d39e9b373798 org/mozilla/jss/crypto/EncryptionAlgorithm.java
---- a/org/mozilla/jss/crypto/EncryptionAlgorithm.java	Fri Sep 08 11:21:22 2017 -0700
-+++ b/org/mozilla/jss/crypto/EncryptionAlgorithm.java	Fri Sep 08 11:32:32 2017 -0700
-@@ -359,8 +359,10 @@
-         AES_ROOT_OID.subBranch(2), 128);
- 
-     public static final EncryptionAlgorithm
--    AES_128_CBC_PAD = new EncryptionAlgorithm(CKM_AES_CBC_PAD, Alg.AES, Mode.CBC,
--        Padding.PKCS5, IVParameterSpecClasses, 16, null, 128); // no oid
-+    AES_128_CBC_PAD = new EncryptionAlgorithm(SEC_OID_AES_128_CBC,
-+        Alg.AES, Mode.CBC,
-+        Padding.PKCS5, IVParameterSpecClasses, 16,
-+        AES_ROOT_OID.subBranch(2), 128);
-     
-     public static final EncryptionAlgorithm
-     AES_192_ECB = new EncryptionAlgorithm(SEC_OID_AES_192_ECB,
-@@ -374,8 +376,10 @@
-         AES_ROOT_OID.subBranch(22), 192);
-     
-     public static final EncryptionAlgorithm
--    AES_192_CBC_PAD = new EncryptionAlgorithm(CKM_AES_CBC_PAD, Alg.AES, Mode.CBC,
--        Padding.PKCS5, IVParameterSpecClasses, 16, null, 192); // no oid
-+    AES_192_CBC_PAD = new EncryptionAlgorithm(SEC_OID_AES_192_CBC,
-+        Alg.AES, Mode.CBC,
-+        Padding.PKCS5, IVParameterSpecClasses, 16,
-+        AES_ROOT_OID.subBranch(22), 192);
- 
-     public static final EncryptionAlgorithm
-     AES_256_ECB = new EncryptionAlgorithm(SEC_OID_AES_256_ECB,
-@@ -393,6 +397,9 @@
-         Padding.PKCS5, IVParameterSpecClasses, 16, null, 256); // no oid
-     
-     public static final EncryptionAlgorithm
--    AES_256_CBC_PAD = AES_CBC_PAD;
-+    AES_256_CBC_PAD = new EncryptionAlgorithm(SEC_OID_AES_256_CBC,
-+        Alg.AES, Mode.CBC,
-+        Padding.PKCS5, IVParameterSpecClasses, 16,
-+        AES_ROOT_OID.subBranch(42), 256);
-     
- }
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504896621 25200
-#      Fri Sep 08 11:50:21 2017 -0700
-# Node ID 0b8a6e84b6c736743f2184b2b858fda6be740544
-# Parent  d39e9b373798ea9d6ae7f35089b07143845b210e
-Bug 1370778 PBE and padded block cipher enhancements and fixes -
-patch jss-ftweedal-0010-PK11Cipher-use-pad-mechanism-for-algorithms-that-use.patch
-Subject: PK11Cipher: use pad mechanism for algorithms that use padding
-From: Fraser Tweedale <ftweedal@redhat.com>
-message:
-PK11Cipher: use pad mechanism for algorithms that use padding
-The PK11Cipher implementation, when initialising a cipher context,
-uses JSS_getPK11MechFromAlg() to retrieve the PKCS #11 mechanism to
-use.  When a JSS EncryptionAlgorithm uses a SEC_OID_TAG, this will
-return the non-padded mechanism.  Then, if the size of the data is
-not a multiple of the cipher block size, a padding error occurs.
-
-When the EncryptionAlgorithm indicates that padding is to be used,
-call PK11_GetPadMechanism() on the result of JSS_getPK11MechFromAlg()
-to get the padding variant of the mechanism.
-
-cfu for ftweedal
-
-diff -r d39e9b373798 -r 0b8a6e84b6c7 org/mozilla/jss/pkcs11/PK11Cipher.c
---- a/org/mozilla/jss/pkcs11/PK11Cipher.c	Fri Sep 08 11:32:32 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11Cipher.c	Fri Sep 08 11:50:21 2017 -0700
-@@ -24,16 +24,16 @@
- JNIEXPORT jobject JNICALL
- Java_org_mozilla_jss_pkcs11_PK11Cipher_initContext
-     (JNIEnv *env, jclass clazz, jboolean encrypt, jobject keyObj,
--        jobject algObj, jbyteArray ivBA)
-+        jobject algObj, jbyteArray ivBA, jboolean padded)
- {
-     return Java_org_mozilla_jss_pkcs11_PK11Cipher_initContextWithKeyBits
--        ( env, clazz, encrypt, keyObj, algObj, ivBA, 0);
-+        ( env, clazz, encrypt, keyObj, algObj, ivBA, 0, padded);
- }
- 
- JNIEXPORT jobject JNICALL
- Java_org_mozilla_jss_pkcs11_PK11Cipher_initContextWithKeyBits
-     (JNIEnv *env, jclass clazz, jboolean encrypt, jobject keyObj,
--        jobject algObj, jbyteArray ivBA, jint keyBits)
-+        jobject algObj, jbyteArray ivBA, jint keyBits, jboolean padded)
- {
-     CK_MECHANISM_TYPE mech;
-     PK11SymKey *key=NULL;
-@@ -53,6 +53,9 @@
-         goto finish;
-     }
- 
-+    if (padded)
-+        mech = PK11_GetPadMechanism(mech);
-+
-     /* get operation type */
-     if( encrypt ) {
-         op = CKA_ENCRYPT;
-diff -r d39e9b373798 -r 0b8a6e84b6c7 org/mozilla/jss/pkcs11/PK11Cipher.java
---- a/org/mozilla/jss/pkcs11/PK11Cipher.java	Fri Sep 08 11:32:32 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11Cipher.java	Fri Sep 08 11:50:21 2017 -0700
-@@ -90,10 +90,13 @@
-         state = ENCRYPT;
- 
-         if( parameters instanceof RC2ParameterSpec ) {
--            contextProxy = initContextWithKeyBits( true, key, algorithm, IV,
--                ((RC2ParameterSpec)parameters).getEffectiveKeyBits() );
-+            contextProxy = initContextWithKeyBits(
-+                true, key, algorithm, IV,
-+                ((RC2ParameterSpec)parameters).getEffectiveKeyBits(),
-+                algorithm.isPadded());
-         } else {
--            contextProxy = initContext( true, key, algorithm, IV );
-+            contextProxy = initContext(
-+                true, key, algorithm, IV, algorithm.isPadded());
-         }
-     }
- 
-@@ -112,10 +115,13 @@
-         state = DECRYPT;
- 
-         if( parameters instanceof RC2ParameterSpec ) {
--            contextProxy = initContextWithKeyBits(false, key, algorithm, IV,
--                ((RC2ParameterSpec)parameters).getEffectiveKeyBits() );
-+            contextProxy = initContextWithKeyBits(
-+                false, key, algorithm, IV,
-+                ((RC2ParameterSpec)parameters).getEffectiveKeyBits(),
-+                algorithm.isPadded());
-         } else {
--            contextProxy = initContext(false, key, algorithm, IV);
-+            contextProxy = initContext(
-+                false, key, algorithm, IV, algorithm.isPadded());
-         }
-     }
- 
-@@ -182,13 +188,13 @@
- 
-     private static native CipherContextProxy
-     initContext(boolean encrypt, SymmetricKey key, EncryptionAlgorithm alg,
--                 byte[] IV)
-+                 byte[] IV, boolean padded)
-         throws TokenException;
- 
-     // This version accepts the number of effective key bits for RC2 CBC.
-     private static native CipherContextProxy
-     initContextWithKeyBits(boolean encrypt, SymmetricKey key,
--                EncryptionAlgorithm alg, byte[] IV, int keyBits)
-+                EncryptionAlgorithm alg, byte[] IV, int keyBits, boolean padded)
-         throws TokenException;
- 
-     private static native byte[]
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504896816 25200
-#      Fri Sep 08 11:53:36 2017 -0700
-# Node ID b3b653faef8475ae03c670766429fd4dfab37a5e
-# Parent  0b8a6e84b6c736743f2184b2b858fda6be740544
-bug 1370778 PBE and padded block cipher enhancements and fixes -
-patch jss-ftweedal-0012-2-Add-method-EncryptedPrivateKeyInfo.createPBES2.patch
-Subject: Add method EncryptedPrivateKeyInfo.createPBES2
-From: Fraser Tweedale <ftweedal@redhat.com>
-Content-Type: text/plain
-found patch at byte 404
-message:
-Add method EncryptedPrivateKeyInfo.createPBES2
-The createPBE method does not support PBES2 (it is necessary to know
-the desired encrypted algorithm to derive the key and build the
-parameters data).  Add the createPBES2 method, which uses PBKDF2 to
-derive the symmetric key and allows the caller to specify the
-encryption algorithm.
-
-cfu for ftweedal
-
-diff -r 0b8a6e84b6c7 -r b3b653faef84 org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java
---- a/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java	Fri Sep 08 11:50:21 2017 -0700
-+++ b/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java	Fri Sep 08 11:53:36 2017 -0700
-@@ -155,6 +155,100 @@
- 
- 
-     /**
-+     * Export a private key in PBES2 format, using a random PBKDF2 salt.
-+     *
-+     * Token must support the CKM_PKCS5_PBKD2 mechanism.
-+     *
-+     * @param saltLen Length of salt in bytes (default: 16)
-+     * @param kdfIterations PBKDF2 iterations (default: 2000)
-+     * @param encAlg The symmetric encryption algorithm for enciphering the
-+     *               private key.  Determines the size of derived key.
-+     * @param pwd Password
-+     * @param charToByteConverter The mechanism for converting the characters
-+     *      in the password into bytes.  If null, the default mechanism
-+     *      will be used, which is UTF8.
-+     * @param privateKeyInfo The encoded PrivateKeyInfo to be encrypted and
-+     *                       stored in the EncryptedContentInfo.
-+     */
-+    public static EncryptedPrivateKeyInfo createPBES2(
-+            int saltLen,
-+            int kdfIterations,
-+            EncryptionAlgorithm encAlg,
-+            Password pwd,
-+            KeyGenerator.CharToByteConverter charToByteConverter,
-+            PrivateKeyInfo privateKeyInfo)
-+        throws CryptoManager.NotInitializedException, NoSuchAlgorithmException,
-+        InvalidKeyException, InvalidAlgorithmParameterException, TokenException,
-+        CharConversionException
-+    {
-+        if (encAlg == null)
-+            throw new IllegalArgumentException("encAlg cannot be null");
-+        if (pwd == null)
-+            throw new IllegalArgumentException("pwd cannot be null");
-+        if (privateKeyInfo == null)
-+            throw new IllegalArgumentException("privateKeyInfo cannot be null");
-+
-+        if (kdfIterations < 1)
-+            kdfIterations = 2000;
-+        if (saltLen < 1)
-+            saltLen = 16;
-+
-+        try {
-+            // generate random PBKDF2 salt
-+            SecureRandom random = new SecureRandom();
-+            byte salt[] = new byte[saltLen];
-+            random.nextBytes(salt);
-+
-+            // derive symmetric key from passphrase using PBKDF2
-+            CryptoManager cm = CryptoManager.getInstance();
-+            CryptoToken token = cm.getInternalCryptoToken();
-+            KeyGenerator kg = token.getKeyGenerator(
-+                PBEAlgorithm.PBE_PKCS5_PBKDF2);
-+            PBEKeyGenParams pbekgParams = new PBEKeyGenParams(
-+                pwd.getChars(), salt, kdfIterations, encAlg);
-+            if (charToByteConverter != null)
-+                kg.setCharToByteConverter(charToByteConverter);
-+            kg.initialize(pbekgParams);
-+            SymmetricKey sk = kg.generate();
-+
-+            // encrypt PrivateKeyInfo
-+            byte iv[] = new byte[encAlg.getBlockSize()];
-+            random.nextBytes(iv);
-+            Cipher cipher = token.getCipherContext(encAlg);
-+            cipher.initEncrypt(sk, new IVParameterSpec(iv));
-+            byte[] encData = cipher.doFinal(ASN1Util.encode(privateKeyInfo));
-+
-+            // construct KDF AlgorithmIdentifier
-+            SEQUENCE paramsKdf = new SEQUENCE();
-+            paramsKdf.addElement(new OCTET_STRING(salt));
-+            paramsKdf.addElement(new INTEGER((long) kdfIterations));
-+            paramsKdf.addElement(new INTEGER((long) sk.getLength()));
-+            AlgorithmIdentifier algIdKdf = new AlgorithmIdentifier(
-+                PBEAlgorithm.PBE_PKCS5_PBKDF2.toOID(), paramsKdf);
-+
-+            // construct encryption AlgorithmIdentifier
-+            AlgorithmIdentifier algIdEnc = new AlgorithmIdentifier(
-+                encAlg.toOID(), new OCTET_STRING(iv));
-+
-+            // construct "composite" PBES2 AlgorithmIdentifier
-+            SEQUENCE paramsPBES2 = new SEQUENCE();
-+            paramsPBES2.addElement(algIdKdf);
-+            paramsPBES2.addElement(algIdEnc);
-+            AlgorithmIdentifier algIdPBES2 = new AlgorithmIdentifier(
-+                PBEAlgorithm.PBE_PKCS5_PBES2.toOID(), paramsPBES2);
-+
-+            // construct EncryptedPrivateKeyInfo
-+            return new EncryptedPrivateKeyInfo(algIdPBES2, new OCTET_STRING(encData));
-+        } catch (IllegalBlockSizeException e) {
-+            Assert.notReached("IllegalBlockSizeException in EncryptedContentInfo.createPBES2");
-+        } catch (BadPaddingException e) {
-+            Assert.notReached("BadPaddingException in EncryptedContentInfo.createPBES2");
-+        }
-+        return null; // unreachable
-+    }
-+
-+
-+    /**
-      * Creates a new EncryptedPrivateKeyInfo, where the data is encrypted
-      * with a password-based key- 
-      *       with wrapping/unwrapping happening on token.
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1504896964 25200
-#      Fri Sep 08 11:56:04 2017 -0700
-# Node ID 87dca07f7529463398734d1279bcfd7023a43d4c
-# Parent  b3b653faef8475ae03c670766429fd4dfab37a5e
-Bug 1370778 PBE and padded block cipher enhancements and fixes -
-patch  jss-ftweedal-0013-Improve-error-reporting.patch
-Subject: Improve error reporting
-From: Fraser Tweedale <ftweedal@redhat.com>
-Content-Type: text/plain
-found patch at byte 157
-message:
-Improve error reporting
-
-cfu for ftweedal
-
-diff -r b3b653faef84 -r 87dca07f7529 org/mozilla/jss/pkcs11/PK11KeyWrapper.c
---- a/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	Fri Sep 08 11:53:36 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11KeyWrapper.c	Fri Sep 08 11:56:04 2017 -0700
-@@ -251,9 +251,7 @@
-     status = PK11_WrapPrivKey(slot, wrapping, toBeWrapped, mech, param,
-                 &wrapped, NULL /* wincx */ );
-     if(status != SECSuccess) {
--        char err[256] = {0};
--        PR_snprintf(err, 256, "Wrapping operation failed on token:%d", PR_GetError());
--        JSS_throwMsg(env, TOKEN_EXCEPTION, err);
-+        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION, "Wrapping operation failed on token");
-         goto finish;
-     }
-     PR_ASSERT(wrapped.len>0 && wrapped.data!=NULL);
-@@ -450,8 +448,8 @@
-                 attribs, numAttribs, NULL /*wincx*/);
-     if( privk == NULL ) {
-         char err[256] = {0};
--        PR_snprintf(err, 256, "Key Unwrap failed on token:error=%d, keyType=%d", PR_GetError(), keyType);
--        JSS_throwMsg(env, TOKEN_EXCEPTION, err);
-+        PR_snprintf(err, 256, "Key Unwrap failed on token; keyType=%d", keyType);
-+        JSS_throwMsgPrErr(env, TOKEN_EXCEPTION, err);
-         goto finish;
-     }
-                 
-diff -r b3b653faef84 -r 87dca07f7529 org/mozilla/jss/pkcs11/PK11Store.c
---- a/org/mozilla/jss/pkcs11/PK11Store.c	Fri Sep 08 11:53:36 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11Store.c	Fri Sep 08 11:56:04 2017 -0700
-@@ -734,7 +734,7 @@
-         PR_TRUE /* isperm */, PR_TRUE /* isprivate */,
-         pubKey->keyType, keyUsage, NULL /* wincx */);
-     if (result != SECSuccess) {
--        JSS_throwMsg(
-+        JSS_throwMsgPrErr(
-             env, TOKEN_EXCEPTION,
-             "Failed to import EncryptedPrivateKeyInfo to token");
-         goto finish;

jss-SignatureAlgorithm.patch

@@ -1,34 +0,0 @@
-# HG changeset patch
-# User David Stutzman david.konrad.stutzman@us.army.mil
-# Date 1509062346 25200
-#      Thu Oct 26 16:59:06 2017 -0700
-# Node ID b1a3c3cc6b3584948d251d3bfcfe6630d8970db5
-# Parent  252c10f448971b7ae087bde259505abd5dc5a03a
-Bugzilla.mozilla 1409867 org.mozilla.jss.pkix.cms.SignerInfo incorrectly producing signatures (especially for EC)
-
-The patch fixes the OID that goes into the signatureAlgorithm field as well as passing the full signature algorithm to the Signature context to generate the signature using the proper algorithm.
-With this patch, if one passes SignatureAlgorithm.RSASignatureWithSHA256Digest in the constructor one will now get sha256WithRSAEncryption (1 2 840 113549 1 1 11) in the signatureAlgorithm field.
-
-cfu checking in for dstutzman
-
-diff --git a/org/mozilla/jss/pkix/cms/SignerInfo.java b/org/mozilla/jss/pkix/cms/SignerInfo.java
---- a/org/mozilla/jss/pkix/cms/SignerInfo.java
-+++ b/org/mozilla/jss/pkix/cms/SignerInfo.java
-@@ -289,7 +289,7 @@
-         }
- 
-         digestEncryptionAlgorithm = new AlgorithmIdentifier(
--            signingAlg.getRawAlg().toOID(),null );
-+            signingAlg.toOID(),null );
- 
- 
-         if( signedAttributes != null ) 
-@@ -332,7 +332,7 @@
-         // encrypt the DER-encoded DigestInfo with the private key
-         CryptoToken token = signingKey.getOwningToken();
-         Signature sig;
--        sig = token.getSignatureContext( signingAlg.getRawAlg() );
-+        sig = token.getSignatureContext( signingAlg );
-         sig.initSign(signingKey);
-         sig.update(toBeSigned);
-         encryptedDigest = new OCTET_STRING(sig.sign());

jss-fix-PK11Store-getEncryptedPrivateKeyInfo-segfault.patch

@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Fraser Tweedale<ftweedale@redhat.com>
-# Date 1505175862 25200
-#      Mon Sep 11 17:24:22 2017 -0700
-# Node ID 3e9a5ae2149d04877dc19b117a8917c22854f8eb
-# Parent  87dca07f7529463398734d1279bcfd7023a43d4c
-Bug 1371147 PK11Store.getEncryptedPrivateKeyInfo() segfault if export fails -
-patch jss-ftweedal-0011-Don-t-crash-if-PK11_ExportEncryptedPrivKeyInfo-retur.patch
-Subject: Don't crash if PK11_ExportEncryptedPrivKeyInfo returns NULL
-From: Fraser Tweedale <ftweedal@redhat.com>
-Content-Type: text/plain
-found patch at byte 239
-message:
-Don't crash if PK11_ExportEncryptedPrivKeyInfo returns NULL
-PK11_ExportEncryptedPrivKeyInfo returning NULL is not being handled
-properly, causing segfault.  Detect this condition and raise a
-TokenException instead.
-
-cfu for ftweedal
-
-diff -r 87dca07f7529 -r 3e9a5ae2149d org/mozilla/jss/pkcs11/PK11Store.c
---- a/org/mozilla/jss/pkcs11/PK11Store.c	Fri Sep 08 11:56:04 2017 -0700
-+++ b/org/mozilla/jss/pkcs11/PK11Store.c	Mon Sep 11 17:24:22 2017 -0700
-@@ -581,6 +581,11 @@
-     // export the epki
-     epki = PK11_ExportEncryptedPrivKeyInfo(
-         slot, algTag, pwItem, privk, iterations, NULL /*wincx*/);
-+    if (epki == NULL) {
-+        JSS_throwMsgPrErr(
-+            env, TOKEN_EXCEPTION, "Failed to export EncryptedPrivateKeyInfo");
-+        goto finish;
-+    }
- 
-     // DER-encode the epki
-     if (SEC_ASN1EncodeItem(NULL, &epkiItem, epki,

jss-fix-SignerInfo-version.patch

@@ -1,44 +0,0 @@
-# HG changeset patch
-# User David Stutzman<david.konrad.stutzman@us.army.mil>
-# Date 1516144092 28800
-#      Tue Jan 16 15:08:12 2018 -0800
-# Node ID 1d858c6d4626b625bb671426e6899d98c2f5bb2e
-# Parent  8746a3fc74785e2fd12f86d08a6886ed9160620e
-Bug# 386351 SignerInfo version, r=cfu
-
-This patch fixes versioning of SignerInfo to match CMS spec.
-
-cfu for dstutzman
-
-diff --git a/org/mozilla/jss/pkix/cms/SignerInfo.java b/org/mozilla/jss/pkix/cms/SignerInfo.java
---- a/org/mozilla/jss/pkix/cms/SignerInfo.java
-+++ b/org/mozilla/jss/pkix/cms/SignerInfo.java
-@@ -52,9 +52,6 @@
-     private OCTET_STRING encryptedDigest;
-     private SET unsignedAttributes; // [1] OPTIONAL
- 
--    // we only do CMS in RFC 2630
--    private static final INTEGER VERSION = new INTEGER(3);
--
-     ///////////////////////////////////////////////////////////////////////
-     ///////////////////////////////////////////////////////////////////////
-     // Accessor methods
-@@ -198,8 +195,17 @@
-         CryptoManager.NotInitializedException, SignatureException,
-         TokenException
-     {
--        version = VERSION;
-+        if (signerIdentifier == null) {
-+            throw new IllegalArgumentException("SignerIdentifier may not be null");
-+        }
-         this.signerIdentifier = signerIdentifier;
-+        if (SignerIdentifier.ISSUER_AND_SERIALNUMBER.equals(this.signerIdentifier.getType())) {
-+            this.version = new INTEGER(1);
-+        } else if (SignerIdentifier.SUBJECT_KEY_IDENTIFIER.equals(this.signerIdentifier.getType())) {
-+            this.version = new INTEGER(3);
-+        } else {
-+            throw new IllegalArgumentException("Unexpected SignerIdentifier type");
-+        }
-         this.digestAlgorithm =
-                 new AlgorithmIdentifier(signingAlg.getDigestAlg().toOID(),null);
- 

jss-pki-sync-netscape-security-util-Utils.patch

@@ -0,0 +1,94 @@
+From a5b0caf63837acfd876ee15e3823fbfdf5685432 Mon Sep 17 00:00:00 2001
+From: Dinesh Prasanth M K <dmoluguw@redhat.com>
+Date: Wed, 30 Jan 2019 12:31:29 -0500
+Subject: [PATCH] Add exec method to execute shell commands with input
+
+- This is an effort to move duplicate code from PKI code
+  base to JSS code base
+
+- This chunk of code was originally introduced in PKI
+  code: https://github.com/dogtagpki/pki/pull/131
+
+- This PR is a joined effort of:
+  https://github.com/dogtagpki/pki/pull/122
+
+Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
+---
+ .../jss/netscape/security/util/Utils.java     | 57 +++++++++++++++++++
+ 1 file changed, 57 insertions(+)
+
+diff --git a/org/mozilla/jss/netscape/security/util/Utils.java b/org/mozilla/jss/netscape/security/util/Utils.java
+index b1a3c341..b45381ae 100644
+--- a/org/mozilla/jss/netscape/security/util/Utils.java
++++ b/org/mozilla/jss/netscape/security/util/Utils.java
+@@ -25,6 +25,7 @@
+ import java.io.FileWriter;
+ import java.io.IOException;
+ import java.io.InputStream;
++import java.io.InputStreamReader;
+ import java.io.OutputStream;
+ import java.io.OutputStreamWriter;
+ import java.io.PrintWriter;
+@@ -96,6 +97,62 @@ public static boolean exec(String cmd) {
+         return false;
+     }
+ 
++    public static String readFromStream(InputStream inputStream) throws IOException {
++        StringBuilder sb = new StringBuilder();
++        BufferedReader br = null;
++        try {
++            br = new BufferedReader(new InputStreamReader(inputStream));
++            String line = null;
++            while ((line = br.readLine()) != null) {
++                sb.append(line + System.getProperty("line.separator"));
++            }
++        } finally {
++            br.close();
++        }
++        return sb.toString().trim();
++    }
++
++    public static void writeToStream(OutputStream outputStream, String input) throws IOException {
++        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream));
++        writer.write(input);
++        writer.flush();
++        writer.close();
++    }
++
++    /**
++     * Utility method to execute system commands
++     *
++     * @param cmd The command to be executed and its arguments
++     * @param input The stdin input to be passed to the cmd
++     * @return stdout or stderr of the command executed
++     * @throws IOException
++     * @throws InterruptedException
++     */
++    public static String exec(String[] cmd, String input) throws IOException, InterruptedException {
++
++        ProcessBuilder pb = new ProcessBuilder(cmd);
++
++        Process p = pb.start();
++
++        if (input != null) {
++            writeToStream(p.getOutputStream(), input);
++        }
++
++        p.waitFor();
++
++        String output;
++        if (p.exitValue() == 0) {
++            output = readFromStream(p.getInputStream());
++        } else {
++            output = readFromStream(p.getErrorStream());
++        }
++        p.destroy();
++
++        return output;
++    }
++
++
++
+     public static String SpecialURLDecode(String s) {
+         if (s == null)
+             return null;

jss-signature-correction.patch

@@ -1,306 +0,0 @@
-# HG changeset patch
-# User David Stutzman<david.konrad.stutzman@us.army.mil>
-# Date 1515711524 28800
-#      Thu Jan 11 14:58:44 2018 -0800
-# Node ID 9e2db7eee6652330723d935c2b900b9b09b1ab9d
-# Parent  ca2c2fcfaf207f87c3c69e493f2b30fd0a088e95
-Bug 1409867 - additional fix from dstutzman: allow signatures to be created correctly.
-
-cfu for dstutzman
-
-diff --git a/org/mozilla/jss/pkix/cms/SignerInfo.java b/org/mozilla/jss/pkix/cms/SignerInfo.java
---- a/org/mozilla/jss/pkix/cms/SignerInfo.java
-+++ b/org/mozilla/jss/pkix/cms/SignerInfo.java
-@@ -9,14 +9,10 @@
- import org.mozilla.jss.util.Assert;
- import org.mozilla.jss.pkix.primitive.*;
- import org.mozilla.jss.crypto.*;
--import java.util.Vector;
--import java.math.BigInteger;
--import java.io.ByteArrayInputStream;
- import java.security.InvalidKeyException;
- import java.security.SignatureException;
- import java.security.NoSuchAlgorithmException;
- import java.security.MessageDigest;
--import org.mozilla.jss.crypto.*;
- import org.mozilla.jss.crypto.X509Certificate;
- import org.mozilla.jss.pkix.cert.*;
- import org.mozilla.jss.*;
-@@ -73,14 +69,6 @@
-     }
- 
-     /**
--     * Low-level method to set the version.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void setVersion(INTEGER version) {
--        this.version = version;
--    }
--     */
--
--    /**
-      * Retrieves the SignerIdentifier.
-      */
-     public SignerIdentifier getSignerIdentifier() {
-@@ -88,14 +76,6 @@
-     }
- 
-     /**
--     * Low-level method to set the signerIdentifier.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void setSignerIdentifier( SignerIdentifier iasn ) {
--        this.signerIdentifier = iasn;
--    }
--     */
--
--    /**
-      * Retrieves the DigestAlgorithm used in this SignerInfo.
-      *
-      * @exception NoSuchAlgorithmException If the algorithm is not
-@@ -116,14 +96,6 @@
-     }
- 
-     /**
--     * Low-level method to set the digest AlgorithmIdentifier.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void setDigestAlgorithmIdentifier(AlgorithmIdentifier algid) {
--        this.digestAlgorithm = algid;
--    }
--     */
--
--    /**
-      * Retrieves the signed attributes, if they exist.
-      *
-      */
-@@ -139,14 +111,6 @@
-     }
- 
-     /**
--     * Low-level method to set the signedAttributes field.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void setSignedAttributes(SET authAttrib) {
--        this.signedAttributes = authAttrib;
--    }
--     */
--
--    /**
-      * Returns the raw signature (digest encryption) algorithm used in this
-      * SignerInfo.
-      *
-@@ -168,15 +132,6 @@
-     }
- 
-     /**
--     * Low-level method to set the digestEncryptionAlgorithm field.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void
--    setDigestEncryptionAlgorithmIdentifier(AlgorithmIdentifier algid) {
--        this.digestEncryptionAlgorithm= algid;
--    }
--     */
--
--    /**
-      * Retrieves the encrypted digest.
-      */
-     public byte[] getEncryptedDigest() {
-@@ -184,14 +139,6 @@
-     }
- 
-     /**
--     * Low-level method to set the encryptedDigest field.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void setEncryptedDigest(byte[] ed) {
--        this.encryptedDigest = new OCTET_STRING(ed);
--    }
--     */
--
--    /**
-      * Retrieves the unsigned attributes, if they exist.
-      *
-      */
-@@ -206,14 +153,6 @@
-         return (unsignedAttributes!=null);
-     }
- 
--    /**
--     * Low-level method to set the unsignedAttributes field.
--     * It is not normally necessary to call this.  Use it at your own risk.
--    public void setUnsignedAttributes(SET unauthAttrib) {
--        this.unsignedAttributes = unauthAttrib;
--    }
--     */
--
-     ///////////////////////////////////////////////////////////////////////
-     ///////////////////////////////////////////////////////////////////////
-     // Constructors
-@@ -221,17 +160,6 @@
-     ///////////////////////////////////////////////////////////////////////
- 
-     /**
--     * Low-level default constructor.  All fields are initialized to null.
--     * Before this SignerInfo can be processed or used in any way, all of
--     * the fields except <code>signedAttributes</code> and
--     * <code>unsignedAttributes</code> must be non-null.
--     * <p>It is not normally necessary to call this constructor.Use it at
--     * your own risk.
--    public SignerInfo() {
--    }
--     */
--
--    /**
-      * A constructor for creating a new SignerInfo from scratch.
-      *
-      * @param signerIdentifier The signerIdentifier of the
-@@ -303,36 +231,32 @@
-         //////////////////////////////////////////////////
- 
-         // compute the digest
--        byte[] digest=null;
--        DigestAlgorithm digestAlg = signingAlg.getDigestAlg();
--        if( signedAttributes == null ) {
-+        CryptoToken token = signingKey.getOwningToken();
-+        Signature sig;
-+        byte[] toBeSigned = null;
-+        if (signedAttributes == null) {
-             // just use the message digest of the content
--            digest = messageDigest;
-+            if (signingAlg.getRawAlg() == SignatureAlgorithm.RSASignature) {
-+                SEQUENCE digestInfo = createDigestInfo(messageDigest, false);
-+                toBeSigned = ASN1Util.encode(digestInfo);
-+            } else {
-+                toBeSigned = messageDigest;
-+            }
-+            sig = token.getSignatureContext(signingAlg.getRawAlg()); //data is already digested
-         } else {
--            // digest the contents octets of the signed attributes
--            byte[] enc = ASN1Util.encode(signedAttributes);
--            MessageDigest md =
--                        MessageDigest.getInstance(digestAlg.toString());
--            digest = md.digest( enc );
--        }
--
--        byte[] toBeSigned;
--        if( signingAlg.getRawAlg() == SignatureAlgorithm.RSASignature ) {
--            // put the digest in a DigestInfo
--            SEQUENCE digestInfo = new SEQUENCE();
--            AlgorithmIdentifier digestAlgId =
--                    new AlgorithmIdentifier( digestAlg.toOID(),null );
--            digestInfo.addElement( digestAlgId );
--            digestInfo.addElement( new OCTET_STRING( digest ) );
--            toBeSigned = ASN1Util.encode(digestInfo);
--        } else {
--            toBeSigned = digest;
-+            byte[] encoding = ASN1Util.encode(signedAttributes);
-+            if (signingAlg.getRawAlg() == SignatureAlgorithm.RSASignature) {
-+                // put the digest in a DigestInfo
-+                SEQUENCE digestInfo = createDigestInfo(encoding, true);
-+                toBeSigned = ASN1Util.encode(digestInfo);
-+                sig = token.getSignatureContext(SignatureAlgorithm.RSASignature);
-+            } else {
-+                toBeSigned = encoding;
-+                sig = token.getSignatureContext(signingAlg);
-+            }
-         }
-         
-         // encrypt the DER-encoded DigestInfo with the private key
--        CryptoToken token = signingKey.getOwningToken();
--        Signature sig;
--        sig = token.getSignatureContext( signingAlg );
-         sig.initSign(signingKey);
-         sig.update(toBeSigned);
-         encryptedDigest = new OCTET_STRING(sig.sign());
-@@ -494,21 +418,20 @@
-                 digestEncryptionAlgorithm.getOID()
-             );
- 
-+        CryptoToken token = CryptoManager.getInstance()
-+                .getInternalCryptoToken();
-+        Signature sig;
-         byte[] toBeVerified;
--        if( sigAlg.getRawAlg() == SignatureAlgorithm.RSASignature ) {
-+        if (sigAlg.getRawAlg() == SignatureAlgorithm.RSASignature) {
-             // create DigestInfo structure
--            SEQUENCE digestInfo = new SEQUENCE();
--            digestInfo.addElement(
--                new AlgorithmIdentifier(digestAlgorithm.getOID(), null) );
--            digestInfo.addElement( new OCTET_STRING(messageDigest) );
-+            SEQUENCE digestInfo = createDigestInfo(messageDigest, false);
-             toBeVerified = ASN1Util.encode(digestInfo);
-+            sig = token.getSignatureContext(sigAlg.getRawAlg());
-         } else {
-             toBeVerified = messageDigest;
-+            sig = token.getSignatureContext(sigAlg);
-         }
--
--        CryptoToken token = CryptoManager.getInstance()
--                                .getInternalCryptoToken();
--        Signature sig = token.getSignatureContext(sigAlg);
-+        
-         sig.initVerify(pubkey);
-         sig.update(toBeVerified);
-         if( sig.verify(encryptedDigest.toByteArray()) ) {
-@@ -671,31 +594,22 @@
-         // Now verify the signature.
-         CryptoToken token =
-                     CryptoManager.getInstance().getInternalCryptoToken();
--        Signature sig = token.getSignatureContext( sigAlg );
--        sig.initVerify(pubkey);
-+        Signature sig;
- 
-         // verify the contents octets of the DER encoded signed attribs
--        byte[] toBeDigested = ASN1Util.encode(signedAttributes);
--    
--        MessageDigest md = MessageDigest.getInstance(
--                DigestAlgorithm.fromOID(digestAlgorithm.getOID()).toString() );
--        byte[] digest = md.digest(toBeDigested);
--
-+        byte[] encoding = ASN1Util.encode(signedAttributes);
-         byte[] toBeVerified;
--        if( sigAlg.getRawAlg() == SignatureAlgorithm.RSASignature ) {
-+        if (sigAlg.getRawAlg() == SignatureAlgorithm.RSASignature) {
-             // create DigestInfo structure
--            SEQUENCE digestInfo = new SEQUENCE();
--		
--            AlgorithmIdentifier digestAlgId =
--                    new AlgorithmIdentifier( digestAlgorithm.getOID(),null );
--            digestInfo.addElement( digestAlgId );
--		
--            digestInfo.addElement( new OCTET_STRING(digest) );
-+            SEQUENCE digestInfo = createDigestInfo(encoding, true);
-             toBeVerified = ASN1Util.encode(digestInfo);
-+            sig = token.getSignatureContext(SignatureAlgorithm.RSASignature);
-         } else {
--            toBeVerified = digest;
-+            toBeVerified = encoding;
-+            sig = token.getSignatureContext(sigAlg);
-         }
-  
-+        sig.initVerify(pubkey);
-         sig.update( toBeVerified );
- 
-         if( ! sig.verify(encryptedDigest.toByteArray()) ) {
-@@ -708,6 +622,25 @@
-         // SUCCESSFULLY VERIFIED
- 
-     }
-+        
-+    private SEQUENCE createDigestInfo(byte[] data, boolean doDigest) throws NoSuchAlgorithmException {
-+        if(data == null || data.length == 0){
-+            throw new IllegalArgumentException("Data to digest must be supplied");
-+        }
-+        SEQUENCE digestInfo = new SEQUENCE();
-+        digestInfo.addElement(this.digestAlgorithm);
-+        byte[] digest;
-+        if (doDigest) {
-+            MessageDigest md = MessageDigest.getInstance(
-+                    DigestAlgorithm.fromOID(this.digestAlgorithm.getOID()).toString());
-+            digest = md.digest(data);
-+        } else {
-+            digest = data;
-+        }
-+        digestInfo.addElement(new OCTET_STRING(digest));
-+        return digestInfo;
-+    }
-+
- 
-     /**
-      * Compares two non-null byte arrays.  Returns true if they are identical,

jss-standardize-ECC-algorithm-names.patch

@@ -1,41 +0,0 @@
-# HG changeset patch
-# User David Stutzman<david.konrad.stutzman@us.army.mil>
-# Date 1515722400 28800
-#      Thu Jan 11 18:00:00 2018 -0800
-# Node ID 8746a3fc74785e2fd12f86d08a6886ed9160620e
-# Parent  9e2db7eee6652330723d935c2b900b9b09b1ab9d
-Bug 589158 Add support for Java Security Standard Algorithm Names for EC Signature types
-
-This patch adds the aliases for Java Security Standard Algorithm Names for EC Signature types.
-
-cfu for dstutzman (reviewed by wtc)
-
-diff --git a/org/mozilla/jss/JSSProvider.java b/org/mozilla/jss/JSSProvider.java
---- a/org/mozilla/jss/JSSProvider.java
-+++ b/org/mozilla/jss/JSSProvider.java
-@@ -79,21 +79,25 @@
-         put("Alg.Alias.Signature.SHA-1/EC", "SHA1withEC");
-         put("Alg.Alias.Signature.SHA/ECDSA", "SHA1withEC");
-         put("Alg.Alias.Signature.SHA1/ECDSA", "SHA1withEC");
-+        put("Alg.Alias.Signature.SHA1withECDSA", "SHA1withEC"); //JCE Standard Name
- 
-         put("Signature.SHA256withEC",
-             "org.mozilla.jss.provider.java.security.JSSSignatureSpi$SHA256EC");
-         put("Alg.Alias.Signature.SHA256/EC", "SHA256withEC");
-         put("Alg.Alias.Signature.SHA-256/EC", "SHA256withEC");
-+        put("Alg.Alias.Signature.SHA256withECDSA", "SHA256withEC"); //JCE Standard Name
- 
-         put("Signature.SHA384withEC",
-             "org.mozilla.jss.provider.java.security.JSSSignatureSpi$SHA384EC");
-         put("Alg.Alias.Signature.SHA384/EC", "SHA384withEC");
-         put("Alg.Alias.Signature.SHA-384/EC", "SHA384withEC");
-+        put("Alg.Alias.Signature.SHA384withECDSA", "SHA384withEC"); //JCE Standard Name
- 
-         put("Signature.SHA512withEC",
-             "org.mozilla.jss.provider.java.security.JSSSignatureSpi$SHA512EC");
-         put("Alg.Alias.Signature.SHA512/EC", "SHA512withEC");
-         put("Alg.Alias.Signature.SHA-512/EC", "SHA512withEC");
-+        put("Alg.Alias.Signature.SHA512withECDSA", "SHA512withEC"); //JCE Standard Name
- 
-         /////////////////////////////////////////////////////////////
-         // Message Digesting

jss.spec

@@ -1,52 +1,89 @@
+################################################################################
 Name:           jss
-Version:        4.4.2
-Release:        10%{?dist}
+################################################################################
+
 Summary:        Java Security Services (JSS)
-
-Group:          System Environment/Libraries
+URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
-URL:            http://www.mozilla.org/projects/security/pki/jss/
-# The source for this package was pulled from upstream's hg. Use the
-# following commands to generate the tarball:
-#
-# hg clone https://hg.mozilla.org/projects/jss
-# cd jss
-# hg archive --prefix jss-4.4.2/jss/ ../jss-4.4.2.tar.gz
-#
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source1:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/MPL-1.1.txt
-Source2:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/gpl.txt
-Source3:        http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/lgpl.txt
 
-Conflicts:      idm-console-framework < 1.1.17-4
-Conflicts:      pki-base < 10.4.0
-Conflicts:      tomcatjss < 7.2.1
+Version:        4.5.2
+Release:        3%{?_timestamp}%{?_commit_id}%{?dist}
+# global         _phase -a1
 
-BuildRequires:  nss-devel >= 3.28.4-6
+# To generate the source tarball:
+# $ git clone https://github.com/dogtagpki/jss.git
+# $ cd jss
+# $ git archive \
+#     --format=tar.gz \
+#     --prefix jss-VERSION/ \
+#     -o jss-VERSION.tar.gz \
+#     <version tag>
+Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
+
+# To create a patch for all changes since a version tag:
+# $ git format-patch \
+#     --stdout \
+#     <version tag> \
+#     > jss-VERSION-RELEASE.patch
+# Patch: jss-VERSION-RELEASE.patch
+Patch1: jss-pki-sync-netscape-security-util-Utils.patch
+
+################################################################################
+# Build Dependencies
+################################################################################
+
+# autosetup
+BuildRequires:  git
+BuildRequires:  make
+BuildRequires:  cmake
+
+BuildRequires:  gcc-c++
 BuildRequires:  nspr-devel >= 4.13.1
+BuildRequires:  nss-devel >= 3.30
+BuildRequires:  nss-tools >= 3.30
 BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
+BuildRequires:  slf4j
+BuildRequires:  glassfish-jaxb-api
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no slf4j-jdk14
+%else
+BuildRequires:  slf4j-jdk14
+%endif
+BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-codec
+
 %if 0%{?fedora} >= 25 || 0%{?rhel} > 7
 BuildRequires:  perl-interpreter
 %endif
-Requires:       java-headless
-Requires:       nss >= 3.28.4-6
 
-Patch1:         jss-HMAC-test-for-AES-encrypt-unwrap.patch
-Patch2:         jss-PBE-padded-block-cipher-enhancements.patch
-Patch3:         jss-fix-PK11Store-getEncryptedPrivateKeyInfo-segfault.patch
-Patch4:         jss-HMAC-unwrap-keywrap-FIPSMODE.patch
-Patch5:         jss-SignatureAlgorithm.patch
-Patch6:         jss-ObjectNotFoundException-message.patch
-Patch7:         jss-signature-correction.patch
-Patch8:         jss-standardize-ECC-algorithm-names.patch
-Patch9:         jss-fix-SignerInfo-version.patch
+Requires:       nss >= 3.30
+Requires:       java-headless
+Requires:       jpackage-utils
+Requires:       slf4j
+Requires:       glassfish-jaxb-api
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no slf4j-jdk14
+%else
+Requires:       slf4j-jdk14
+%endif
+Requires:       apache-commons-lang
+Requires:       apache-commons-codec
+
+Conflicts:      ldapjdk < 4.20
+Conflicts:      idm-console-framework < 1.2
+Conflicts:      tomcatjss < 7.3.4
+Conflicts:      pki-base < 10.6.5
 
 %description
 Java Security Services (JSS) is a java native interface which provides a bridge
 for java-based applications to use native Network Security Services (NSS).
 This only works with gcj. Other JREs require that JCE providers be signed.
 
+################################################################################
 %package javadoc
+################################################################################
+
 Summary:        Java Security Services (JSS) Javadocs
 Group:          Documentation
 Requires:       jss = %{version}-%{release}
@@ -54,452 +91,103 @@ Requires:       jss = %{version}-%{release}
 %description javadoc
 This package contains the API documentation for JSS.
 
+################################################################################
 %prep
-%setup -q -n %{name}-%{version}
-pushd jss
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-popd
 
+%autosetup -n %{name}-%{version}%{?_phase} -p 1 -S git
+
+################################################################################
 %build
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-[ -z "$USE_INSTALLED_NSPR" ] && export USE_INSTALLED_NSPR=1
-[ -z "$USE_INSTALLED_NSS" ] && export USE_INSTALLED_NSS=1
 
-# Enable compiler optimizations and disable debugging code
-# NOTE: If you ever need to create a debug build with optimizations disabled
-# just comment out this line and change in the %%install section below the
-# line that copies jars xpclass.jar to be xpclass_dbg.jar
+%set_build_flags
+
+[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
+
+# Enable compiler optimizations
 export BUILD_OPT=1
 
 # Generate symbolic info for debuggers
-XCFLAGS="-g $RPM_OPT_FLAGS"
-export XCFLAGS
-
-PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-
-NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
-NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
-
-NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
-NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
-
-export NSPR_INCLUDE_DIR
-export NSPR_LIB_DIR
-export NSS_INCLUDE_DIR
-export NSS_LIB_DIR
-
-%if 0%{?__isa_bits} == 64
-USE_64=1
-export USE_64
-%endif
+CFLAGS="-g $RPM_OPT_FLAGS"
+export CFLAGS
 
 # The Makefile is not thread-safe
-make -C jss/coreconf
-make -C jss
-make -C jss javadoc
+rm -rf build && mkdir -p build && cd build
+%cmake \
+    -DJAVA_HOME=%{java_home} \
+    -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
+    ..
 
-%check
+%{__make} all test javadoc
 
+################################################################################
 %install
-rm -rf $RPM_BUILD_ROOT docdir
-
-# Copy the license files here so we can include them in %%doc
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
-cp -p %{SOURCE3} .
 
 # There is no install target so we'll do it by hand
 
 # jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-# NOTE: if doing a debug no opt build change xpclass.jar to xpclass_dbg.jar
-install -m 644 dist/xpclass.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
+install -m 644 build/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
 
 # We have to use the name libjss4.so because this is dynamically
 # loaded by the jar file.
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/jss
-install -m 0755 dist/Linux*.OBJ/lib/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
+install -m 0755 build/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
 pushd  ${RPM_BUILD_ROOT}%{_libdir}/jss
     ln -fs %{_jnidir}/jss4.jar jss4.jar
 popd
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp dist/jssdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -p jss/jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -p jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 # No ldconfig is required since this library is loaded by Java itself.
+################################################################################
 %files
+
 %defattr(-,root,root,-)
-%doc jss/jss.html MPL-1.1.txt gpl.txt lgpl.txt
-%{_libdir}/jss/*
+%doc jss.html MPL-1.1.txt gpl.txt lgpl.txt
+%{_libdir}/*
 %{_jnidir}/*
-%{_libdir}/jss/lib*.so
 
+################################################################################
 %files javadoc
+
 %defattr(-,root,root,-)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%{_javadocdir}/%{name}-%{version}/
 
+################################################################################
 %changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.2-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Fri Feb 01 2019 Dogtag PKI Team <pki-devel@redhat.com> 4.5.2-3
+- Include nuxwdog patch for netscape.security.util.Utils from PKI
 
-* Mon Jan 22 2018 Dogtag Team <pki-devel@redhat.com> 4.4.2-9
-- Mozilla Bugzilla #1409867 - org.mozilla.jss.pkix.cms.SignerInfo incorrectly
-  producing signatures (especially for EC) (cfu,dstutzman)
-- Mozilla Bugzilla #589158 - Add Sun's standard algorithm names for all ECC
-  signature types (cfu,dstutzman)
-- Mozilla Bugzilla #386351 - SignerInfo class inserts wrong version # into
-  the resulting structure (cfu,dstutzman)
+* Mon Jan 14 2019 Dogtag PKI Team <pki-devel@redhat.com> 4.5.2-1
+- Rebased to JSS 4.5.2
 
-* Mon Jan 08 2018 Karsten Hopp <karsten@redhat.com> - 4.4.2-8
-- update build dependencies
+* Thu Nov 29 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.1-1
+- Rebased to JSS 4.5.1
+- Red Hat Bugzilla #1582323 - DER encoding error for enumerated types with a value of zero
+- Red Hat Bugzilla #1534765 - javadoc for org.mozilla.jss.pkix.cms.SignedData.getSignerInfos() is incorrect
 
-* Wed Nov  1 2017 Dogtag Team <pki-devel@redhat.com> 4.4.2-7
-- Mozilla Bugzilla #1408057 - JSS throws ObjectNotFoundException without
-  message (edewata)
-- Mozilla Bugzilla #1409867 - org.mozilla.jss.pkix.cms.SignerInfo incorrectly
-  producing signatures (especially for EC) (cfu,dstutzman)
+* Fri Aug 10 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-1
+- Rebased to JSS 4.5.0
 
-* Fri Oct 27 2017 Dogtag Team <pki-devel@redhat.com> 4.4.2-6
-- Mozilla Bugzilla #1400884 - new JSS failures: HMAC Unwrap and KeyWrapping
-  FIPSMODE (jmagne)
+* Tue Aug 07 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.6
+- Rebased to JSS 4.5.0-b1
 
-* Mon Sep 11 2017 Dogtag Team <pki-devel@redhat.com> 4.4.2-5
-- Mozilla Bugzilla #1370778 - PBE and padded block cipher enhancements and
-  fixes (ftweedal)
-- Mozilla Bugzilla #1371147 - PK11Store.getEncryptedPrivateKeyInfo() segfault
-  if export fails (ftweedal)
-- Mozilla Bugzilla #1373824 - Mozilla Bug #1373824 - Bug 1308027 (change 2163)
-  breaks HMAC-SHA1 key imports (jmagne)
+* Tue Aug 07 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.5
+- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3)
 
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+* Fri Jul 20 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.4
+- Rebased to JSS 4.5.0-a4
+- Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide
 
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+* Thu Jul 05 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.3
+- Rebased to JSS 4.5.0-a3
 
-* Tue May  9 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.2-2
-- Bump NSS dependencies from 4.28.3 to 4.28.4-6 to pick-up fix in
-  Mozilla Bugzilla #1360207 - Fix incorrect if (ss->...) in SSL_ReconfigFD
+* Fri Jun 22 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.2
+- Rebased to JSS 4.5.0-a2
 
-* Mon May  1 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.2-1
-- Mozilla Bugzilla #1352476 - RFE: Document on the README how to create a
-  release tag (mharmsen)
-- Mozilla Bugzilla #1355358 - CryptoStore: add methods for importing and
-  exporting EncryptedPrivateKeyInfo (ftweedal)
-- Mozilla Bugzilla #1359731 - CryptoStore.importPrivateKey enhancements
-  (ftweedal)
-
-* Mon Apr 17 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.1-2
-- Mozilla Bugzilla #1355268 - JSS 4.4 is incompatible with versions of
-  idm-console-framework < 1.1.17-4
-- Red Hat Bugzilla #1435076 - Remove unused legacy lines from JSS spec files
-
-* Mon Mar 27 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.1-1
-- Bugzilla Bug #1431937 - Rebase jss to 4.4.x in Fedora 25+
-- Updated build requirements for NSPR
-- Updated build and runtime requirements for NSS
-- ## 'jss-post-rebase.patch' resolves the following issues ported from
-  ## upstream:
-- Mozilla Bugzilla #1337092 - CMC conformance update: Implement required ASN.1
-  code for RFC5272+ (cfu)
-- Mozilla Bugzilla #1347394 - Eclipse project files for JSS (edewata)
-- Mozilla Bugzilla #1347429 - Deprecated SSL 3.0 cipher names in SSLSocket
-  class. (edewata)
-- Mozilla Bugzilla #1348856 - SSL alert callback (edewata)
-- Mozilla Bugzilla #1349278 - SSL cipher enumeration (edewata)
-- Mozilla Bugzilla #1349349 - Problem with Password.readPasswordFromConsole().
-  (edewata)
-- Mozilla Bugzilla #1349831 - Revise top-level README file (mharmsen)
-- Mozilla Bugzilla #1349836 - Changes to JSS Version Block (mharmsen)
-- Mozilla Bugzilla #1350130 - Missing
-  CryptoManager.verifyCertificateNowCUNative() implementation. (emaldona)
-
-* Tue Mar 21 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.0-3
-- Bugzilla Bug #1434535 -  JSS 4.4.x is incompatible with versions of
-  pki-base < 10.4.0
-
-* Wed Mar 15 2017 Matthew Harmsen <mharmsen@redhat.com> - 4.4.0-2
-- Bugzilla Bug #1432568 - JSS 4.4.x is incompatible with versions of
-  tomcatjss < 7.2.1 
-
-* Mon Mar 13 2017 Elio Maldonado <emaldona@redhat.com> - 4.4.0-1
-- Bugzilla Bug #1431937 - Rebase jss to 4.4.x in Fedora 25+
-- ## JSS 4.4.0 includes the following patches ported from downstream:
-- Mozilla Bugzilla #507536 - Add IPv6 functionality to JSS
-- Mozilla Bugzilla #1307872 - Expose NSS calls for OCSP settings
-- Mozilla Bugzilla #1307882 - RFE ecc - add ecc curve name support in JSS and
-  CS interface
-- Mozilla Bugzilla #1307993 - Expose updated certificate verification function
-  in JSS
-- Mozilla Bugzilla #1308000 - Incorrect socket accept error message due to bad
-  pointer arithmetic
-- Mozilla Bugzilla #1308001 - Verification should fail when a revoked
-  certificate is added
-- Mozilla Bugzilla #1308004 - Warnings should be cleaned up in JSS build
-- Mozilla Bugzilla #1308006 - DRM failed to recovery keys when in FIPS mode
-  (HSM + NSS)
-- Mozilla Bugzilla #1308008 - Defects revealed by Coverity scan
-- Mozilla Bugzilla #1308009 - Add support for PKCS5v2; support for secure PKCS12
-- Mozilla Bugzilla #1308012 - DRM: during archiving and recovering, wrapping
-  unwrapping keys should be done in the token
-- Mozilla Bugzilla #1308013 - JSS - HSM token name was mistaken for
-  manufacturer identifier
-- Mozilla Bugzilla #1308017 - Un-deprecate previously deprecated methods in
-  JSS 4.2.6
-- Mozilla Bugzilla #1308019 - Provide Tomcat support for TLS v1.1 and
-  TLS v1.2 via NSS through JSS
-- Mozilla Bugzilla #1308026 - JSS certificate validation does not pass up exact
-  error from NSS
-- Mozilla Bugzilla #1308027 - Merge pki-symkey into jss
-- Mozilla Bugzilla #1308029 - Resolve Javadoc build issues
-- Mozilla Bugzilla #1308047 - support ECC encryption key archival and recovery
-- Mozilla Bugzilla #1313122 - Remove bypass tests as latest NSS has removed
-  PKCS#11 bypass support
-- Mozilla Bugzilla #1328675 - Simple problem unwrapping AES sym keys on token
-- Mozilla Bugzilla #1345174 - Cannot create system certs when using LunaSA HSM
-  in FIPS Mode and ECC algorithms
-- Mozilla Bugzilla #1345613 - expose AES KeyWrap and add some useful OID
-  functions
-- Mozilla Bugzilla #1346410 - Load JSS libraries appropriately
-- ## JSS 4.4.0 includes the following changes for building and testing:
-- Mozilla Bugzilla #1331765 - Simplify JSS Makefile build and test
-- Mozilla Bugzilla #1346420 - Document steps required to use the proper
-  libjss4.so when running certain HMAC Algorithms tests
-
-* Wed Feb 22 2017 Jack Magne <jmagne@redhat.com> - 4.2.6-44
-- Bugzilla Bug #1425971 - Simple problem unwrapping AES sym keys on token
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.6-43
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Aug 9 2016 Christina Fu <cfu@redhat.com> - 4.2.6-42
-- Sync up patches from both Fedora and RHEL; adding two patches
-  (cfu, edewata, mharmsen) from RHEL:
-- Bugzilla Bug #1238450 - UnsatisfiedLinkError on Windows (cfu)
-- make it compile on Windows platforms (cfu for nhosoi)
-
-* Fri Jun 24 2016 Christina Fu <cfu@redhat.com> - 4.2.6-41
-- Bugzilla 1221295 jss fails to decode EncryptedKey >> EnvelopedData
-  (cfu for roysjosh@gmail.com)
-
-* Thu May 19 2016 Christina Fu <cfu@redhat.com> - 4.2.6-40
-- Bugzilla 1074208 - pass up exact JSS certificate validation errors from NSS
-  (edewata)
-- Bugzilla 1331596 - Key archival fails when KRA is configured with lunasa.
-  (cfu)
-- PKI ticket 801 - Merge pki-symkey into jss (phase 1)
-  (jmagne)
-
-* Wed Dec 09 2015 Endi Dewata <edewata@redhat.com> - 4.2.6-38
-- Bugzilla Bug #1289799 - JSS build failure on F23 and Rawhide (edewata)
-
-* Thu Apr 09 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 4.2.6-37
-- Fix use of __isa_bits macro so it does not fail during srpm generation on koji
-
-* Thu Apr 09 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 4.2.6-36
-- Use __isa_bits macro to check for 64-bit arch. Unblocks aarch64 and ppc64le.
-
-* Tue Sep 30 2014 Christina Fu <cfu@redhat.com> - 4.2.6-35
-- Bugzilla Bug #1040640 - Incorrect OIDs for SHA2 algorithms
-  (cfu for jnimeh@gmail.com)
-- Bugzilla Bug #1133718 - Key strength validation is not performed for RC4
-  algorithm (nkinder)
-- Bugzilla Bug #816396 - Provide Tomcat support for TLS v1.1 and
-  TLS v1.2 via NSS through JSS (cfu)
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 4.2.6-32
-- Use Requires: java-headless rebuild (#1067528)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Nathan Kinder <nkinder@redhat.com> - 4.2.6-30
-- Bugzilla Bug #847120 - Unable to build JSS on F17 or newer
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Dec 19 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 4.2.6-28
-- revbump after jnidir change
-
-* Wed Dec 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 4.2.6-27
-- Simple rebuild
-
-* Mon Nov 19 2012 Christina Fu <cfu@redhat.com> - 4.2.6-26
-- added source URLs in spec file to pass Package Wrangler
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Mar 30 2012 Matthew Harmsen <mharmsen@redhat.com> - 4.2.6-24
-- Bugzilla Bug #783007 - Un-deprecate previously deprecated methods in
-  JSS 4.2.6 . . . BadPaddingException (mharmsen)
-
-* Tue Mar 20 2012 Christina Fu <cfu@redhat.com> - 4.2.6-23
-- Bugzilla Bug #797351 - JSS - HSM token name was mistaken for manufacturer
-  identifier (cfu)
-- Bugzilla Bug #804840 - [RFE] ECC encryption keys cannot be archived
-  ECC phase2 work - support for ECC encryption key archival and recovery (cfu)
-- Bugzilla Bug #783007 - Un-deprecate previously deprecated methods in
-  JSS 4.2.6 . . . (mharmsen)
-- Dogtag TRAC Task #109 (https://fedorahosted.org/pki/ticket/109) - add
-  benign JNI jar file symbolic link from JNI libdir to JNI jar file (mharmsen)
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Oct 19 2011 Christina Fu <cfu@redhat.com> - 4.2.6-21
-- Bugzilla Bug #737122 - DRM: during archiving and recovering, wrapping
-  unwrapping keys should be done in the token
-- support for PKCS5v2; support for secure PKCS12
-- Bugzilla Bug #744797 - KRA key recovery (retrieve pkcs#12) fails after the
-  in-place upgrade( CS 8.0->8.1)
-
-* Mon Sep 19 2011 Matthew Harmsen <mharmsen@redhat.com> - 4.2.6-20
-- Bugzilla Bug #715621 - Defects revealed by Coverity scan
-
-* Wed Aug 31 2011 Matthew Harmsen <mharmsen@redhat.com> - 4.2.6-19.1
-- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
-
-* Mon Aug 15 2011 Christina Fu <cfu@redhat.com> - 4.2.6-19
-- Bugzilla Bug 733550 - DRM failed to recovery keys when in FIPS mode
-  (HSM + NSS)
-
-* Fri Aug 12 2011 Matthew Harmsen <mharmsen@redhat.com> - 4.2.6-18
-- Bugzilla Bug #660436 - Warnings should be cleaned up in JSS build
-  (jdennis, mharmsen)
-
-* Wed May 18 2011 Christina Fu <cfu@redhat.com> - 4.2.6-17
-- Bug 670980 - Cannot create system certs when using LunaSA HSM in FIPS Mode
-  and ECC algorithms (support tokens that don't do ECDH)
-
-* Fri Apr 08 2011 Jack Magne <jmagne@redhat.com> - 4.2.6-15.99
-- bug 694661 - TKS instance crash during token enrollment.
-  Back out of previous patch for #676083.
-
-* Thu Feb 24 2011 Andrew Wnuk <awnuk@redhat.com> - 4.2.6-15
-- bug 676083 - JSS: slots not freed 
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jan 31 2011 John Dennis <jdennis@redhat.com> - 4.2.6-13
-- remove misleading comment in spec file concerning jar signing
-
-* Tue Jan 11 2011 Kevin Wright <kwright@redhat.com> - 4.2.6-12
-- added missing patch line
-
-* Tue Dec 21 2010 Christina Fu <cfu@redhat.com> - 4.2.6-11
-- bug 654657 - <jdennis@redhat.com>
-  Incorrect socket accept error message due to bad pointer arithmetic
-- bug 661142 - <cfu@redhat.com>
-  Verification should fail when a revoked certificate is added
-
-* Thu Dec 16 2010 John Dennis <jdennis@redhat.com> - 4.2.6-10
-- Resolves: bug 656094 - <jdennis@redhat.com>
-  Rebase jss to at least jss-4.2.6-9
-- <jdennis@redhat.com>
-  merge in updates from Fedora
-  move jar location to %%{_libdir}/jss and provide symlinks, on 32bit looks like this:
-    /usr/lib/java/jss4.jar -> /usr/lib/jss/jss4.jar
-    /usr/lib/jss/jss4-<version>.jar
-    /usr/lib/jss/jss4.jar -> jss4-<version>.jar
-    /usr/lib/jss/libjss4.so
-- bug 654657 - <jdennis@redhat.com>
-  Incorrect socket accept error message due to bad pointer arithmetic
-- bug 647364 - <cfu@redhat.com>
-  Expose updated certificate verification function in JSS
-- bug 529945 - <cfu@redhat.com>
-  expose NSS calls for OCSP settings
-- bug 638833 - <cfu@redhat.com>
-  rfe ecc - add ec curve name support in JSS and CS
-- <rcritten@redhat.com>
-  Need to explicitly catch UnsatisfiedLinkError exception for System.load()
-- bug 533304 - <rcritten@redhat.com>
-  Move location of libjss4.so to subdirectory and use System.load() to
-  load it instead of System.loadLibrary() for Fedora packaging compliance
-
-* Mon Nov 30 2009 Dennis Gregorovic <dgregor@redhat.com> - 4.2.6-4.1
-- Rebuilt for RHEL 6
-
-* Fri Jul 31 2009 Rob Crittenden <rcritten@redhat.com> 4.2.6-4
-- Resolves: bug 224688 - <cfu@redhat.com>
-  Support ECC POP on the server
-- Resolves: bug 469456 - <jmagne@redhat.com>
-  Server Sockets are hard coded to IPV4
-- Resolves: bug 509183 - <mharmsen@redhat.com>
-  Set NSS dependency >= 3.12.3.99
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jun  5 2009 Rob Crittenden <rcritten@redhat.com> 4.2.6-2
-- Include patch to fix missing @param so javadocs will build
-
-* Fri Jun  5 2009 Rob Crittenden <rcritten@redhat.com> 4.2.6-1
-- Resolves: bug 455305 - <cfu@redhat.com>
-  CA ECC Signing Key Failure
-- Resolves: bug 502111 - <cfu@redhat.com>
-  Need JSS interface for NSS's PK11_GenerateKeyPairWithOpFlags() function
-- Resolves: bug 503809 - <mharmsen@redhat.com>
-  Update JSS version to 4.2.6
-- Resolves: bug 503817 - <mharmsen@redhat.com>
-  Create JSS Javadocs as their own RPM
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- 
-* Tue Aug  5 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 4.2.5-3
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.2.5-2
-- Autorebuild for GCC 4.3
-
-* Fri Aug  3 2007 Rob Crittenden <rcritten@redhat.com> 4.2.5-1
-- update to 4.2.5
-
-* Thu May 24 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-6
-- Use _jnidir macro instead of _javadir for the jar files. This will break
-  multilib installs but adheres to the jpackage spec.
-
-* Wed May 16 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-5
-- Include the 3 license files
-- Remove Requires for nss and nspr. These libraries have versioned symbols
-  so BuildRequires is enough to set the minimum.
-- Add sparc64 for the 64-bit list
-
-* Mon May 14 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-4
-- Included additional comments on jar signing and why ldconfig is not
-  required.
-
-* Thu May 10 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-3
-- Added information on how to pull the source into a tar.gz
-
-* Thu Mar 15 2007  Rob Crittenden <rcritten@redhat.com> 4.2.4-2
-- Added RPM_OPT_FLAGS to XCFLAGS
-- Added link to Sun JCE information
-
-* Tue Feb 27 2007 Rob Crittenden <rcritten@redhat.com> 4.2.4-1
-- Initial build
+* Fri Jun 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.1
+- Rebased to JSS 4.5.0-a1

lgpl.txt

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-

sources

@@ -1 +1 @@
-SHA512 (jss-4.4.2.tar.gz) = 71f76aef2905c374a0d87b25a73db2498562fe16cef1489c5859271d2ae264695dd2b00880539c35b21f4e0b19856abc5028b813fe05b33352304b538182b251
+SHA512 (jss-4.5.2.tar.gz) = 344b31a218b7aebb15cc24e24d5697978889bf37856ddefc9521899d2a2a80b1bc9ed0b498a6e0cd19deed169fe1bc56f1ad42e7b8cfc188fadd28245d7bec31

sources-update.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+SOURCE=$1
+TARGET=`basename $1`
+
+cp $SOURCE $TARGET
+sha512sum --tag $TARGET > sources