Acked-by: Kent Yoder <[email protected]> On Mon, Sep 13, 2010 at 10:45:49PM -0300, Klaus Heinrich Kiwi wrote: > pkcsconf.msg was being used to generate pkcsconf_msg.h, but that > is not true anymore. > > Signed-off-by: Klaus Heinrich Kiwi <[email protected]> > --- > usr/sbin/pkcsconf/pkcsconf.msg | 386 > -------------------------------------- > usr/sbin/pkcsconf/pkcsconf_msg.h | 4 - > 2 files changed, 0 insertions(+), 390 deletions(-) > delete mode 100755 usr/sbin/pkcsconf/pkcsconf.msg > > diff --git a/usr/sbin/pkcsconf/pkcsconf.msg b/usr/sbin/pkcsconf/pkcsconf.msg > deleted file mode 100755 > index bce440b..0000000 > --- a/usr/sbin/pkcsconf/pkcsconf.msg > +++ /dev/null > @@ -1,386 +0,0 @@ > - > - > -$ > -$ > -$ $Header: > /cvsroot/opencryptoki/opencryptoki/usr/sbin/pkcsconf/pkcsconf.msg,v 1.1 > 2005/04/11 20:22:18 mhalcrow Exp $ > -$ > - > -$ > -$ Common Public License Version 0.5 > - > -$ THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF > -$ THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, > -$ REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES > -$ RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. > -$ > -$ 1. DEFINITIONS > -$ > -$ "Contribution" means: > -$ a) in the case of the initial Contributor, the > -$ initial code and documentation distributed under > -$ this Agreement, and > -$ > -$ b) in the case of each subsequent Contributor: > -$ i) changes to the Program, and > -$ ii) additions to the Program; > -$ > -$ where such changes and/or additions to the Program > -$ originate from and are distributed by that > -$ particular Contributor. A Contribution 'originates' > -$ from a Contributor if it was added to the Program > -$ by such Contributor itself or anyone acting on such > -$ Contributor's behalf. Contributions do not include > -$ additions to the Program which: (i) are separate > -$ modules of software distributed in conjunction with > -$ the Program under their own license agreement, and > -$ (ii) are not derivative works of the Program. > -$ > -$ > -$ "Contributor" means any person or entity that distributes > -$ the Program. > -$ > -$ "Licensed Patents " mean patent claims licensable by a > -$ Contributor which are necessarily infringed by the use or > -$ sale of its Contribution alone or when combined with the > -$ Program. > -$ > -$ "Program" means the Contributions distributed in > -$ accordance with this Agreement. > -$ > -$ "Recipient" means anyone who receives the Program under > -$ this Agreement, including all Contributors. > -$ > -$ 2. GRANT OF RIGHTS > -$ > -$ a) Subject to the terms of this Agreement, each > -$ Contributor hereby grants Recipient a > -$ non-exclusive, worldwide, royalty-free copyright > -$ license to reproduce, prepare derivative works of, > -$ publicly display, publicly perform, distribute and > -$ sublicense the Contribution of such Contributor, if > -$ any, and such derivative works, in source code and > -$ object code form. > -$ > -$ b) Subject to the terms of this Agreement, each > -$ Contributor hereby grants Recipient a > -$ non-exclusive, worldwide, royalty-free patent > -$ license under Licensed Patents to make, use, sell, > -$ offer to sell, import and otherwise transfer the > -$ Contribution of such Contributor, if any, in source > -$ code and object code form. This patent license > -$ shall apply to the combination of the Contribution > -$ and the Program if, at the time the Contribution is > -$ added by the Contributor, such addition of the > -$ Contribution causes such combination to be covered > -$ by the Licensed Patents. The patent license shall > -$ not apply to any other combinations which include > -$ the Contribution. No hardware per se is licensed > -$ hereunder. > -$ > -$ c) Recipient understands that although each > -$# Contributor grants the licenses to its > -$ Contributions set forth herein, no assurances are > -$ provided by any Contributor that the Program does > -$ not infringe the patent or other intellectual > -$ property rights of any other entity. Each > -$ Contributor disclaims any liability to Recipient > -$ for claims brought by any other entity based on > -$ infringement of intellectual property rights or > -$ otherwise. As a condition to exercising the rights > -$ and licenses granted hereunder, each Recipient > -$ hereby assumes sole responsibility to secure any > -$ other intellectual property rights needed, if any. > -$ > -$ For example, if a third party patent license is > -$ required to allow Recipient to distribute the > -$ Program, it is Recipient's responsibility to > -$ acquire that license before distributing the > -$ Program. > -$ > -$ d) Each Contributor represents that to its > -$ knowledge it has sufficient copyright rights in its > -$ Contribution, if any, to grant the copyright > -$ license set forth in this Agreement. > -$ > -$ 3. REQUIREMENTS > -$ > -$ A Contributor may choose to distribute the Program in > -$ object code form under its own license agreement, provided > -$ that: > -$ a) it complies with the terms and conditions of > -$ this Agreement; and > -$ > -$ b) its license agreement: > -$ i) effectively disclaims on behalf of all > -$ Contributors all warranties and conditions, express > -$ and implied, including warranties or conditions of > -$ title and non-infringement, and implied warranties > -$ or conditions of merchantability and fitness for a > -$ particular purpose; > -$ > -$ ii) effectively excludes on behalf of all > -$ Contributors all liability for damages, including > -$ direct, indirect, special, incidental and > -$ consequential damages, such as lost profits; > -$ > -$ iii) states that any provisions which differ from > -$ this Agreement are offered by that Contributor > -$ alone and not by any other party; and > -$ > -$ iv) states that source code for the Program is > -$ available from such Contributor, and informs > -$ licensees how to obtain it in a reasonable manner > -$ on or through a medium customarily used for > -$ software exchange. > -$ > -$ When the Program is made available in source code form: > -$ a) it must be made available under this Agreement; > -$ and > -$ b) a copy of this Agreement must be included with > -$ each copy of the Program. > -$ > -$ Contributors may not remove or alter any copyright notices > -$ contained within the Program. > -$ > -$ Each Contributor must identify itself as the originator of > -$ its Contribution, if any, in a manner that reasonably > -$ allows subsequent Recipients to identify the originator of > -$ the Contribution. > -$ > -$ > -$ 4. COMMERCIAL DISTRIBUTION > -$ > -$ Commercial distributors of software may accept certain > -$ responsibilities with respect to end users, business > -$ partners and the like. While this license is intended to > -$ facilitate the commercial use of the Program, the > -$ Contributor who includes the Program in a commercial > -$ product offering should do so in a manner which does not > -$ create potential liability for other Contributors. > -$ Therefore, if a Contributor includes the Program in a > -$ commercial product offering, such Contributor ("Commercial > -$ Contributor") hereby agrees to defend and indemnify every > -$ other Contributor ("Indemnified Contributor") against any > -$ losses, damages and costs (collectively "Losses") arising > -$ from claims, lawsuits and other legal actions brought by a > -$ third party against the Indemnified Contributor to the > -$ extent caused by the acts or omissions of such Commercial > -$ Contributor in connection with its distribution of the > -$ Program in a commercial product offering. The obligations > -$ in this section do not apply to any claims or Losses > -$ relating to any actual or alleged intellectual property > -$ infringement. In order to qualify, an Indemnified > -$ Contributor must: a) promptly notify the Commercial > -$ Contributor in writing of such claim, and b) allow the > -$ Commercial Contributor to control, and cooperate with the > -$ Commercial Contributor in, the defense and any related > -$ settlement negotiations. The Indemnified Contributor may > -$ participate in any such claim at its own expense. > -$ > -$ > -$ For example, a Contributor might include the Program in a > -$ commercial product offering, Product X. That Contributor > -$ is then a Commercial Contributor. If that Commercial > -$ Contributor then makes performance claims, or offers > -$ warranties related to Product X, those performance claims > -$ and warranties are such Commercial Contributor's > -$ responsibility alone. Under this section, the Commercial > -$ Contributor would have to defend claims against the other > -$ Contributors related to those performance claims and > -$ warranties, and if a court requires any other Contributor > -$ to pay any damages as a result, the Commercial Contributor > -$ must pay those damages. > -$ > -$ > -$ 5. NO WARRANTY > -$ > -$ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE > -$ PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT > -$ WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR > -$ IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR > -$ CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR > -$ FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely > -$ responsible for determining the appropriateness of using > -$ and distributing the Program and assumes all risks > -$ associated with its exercise of rights under this > -$ Agreement, including but not limited to the risks and > -$ costs of program errors, compliance with applicable laws, > -$ damage to or loss of data, programs or equipment, and > -$ unavailability or interruption of operations. > -$ > -$ 6. DISCLAIMER OF LIABILITY > -$ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER > -$ RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY > -$ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, > -$ OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION > -$ LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF > -$ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > -$ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT > -$ OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE > -$ OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE > -$ POSSIBILITY OF SUCH DAMAGES. > -$ > -$ 7. GENERAL > -$ > -$ If any provision of this Agreement is invalid or > -$ unenforceable under applicable law, it shall not affect > -$ the validity or enforceability of the remainder of the > -$ terms of this Agreement, and without further action by the > -$ parties hereto, such provision shall be reformed to the > -$ minimum extent necessary to make such provision valid and > -$ enforceable. > -$ > -$ > -$ If Recipient institutes patent litigation against a > -$ Contributor with respect to a patent applicable to > -$ software (including a cross-claim or counterclaim in a > -$ lawsuit), then any patent licenses granted by that > -$ Contributor to such Recipient under this Agreement shall > -$ terminate as of the date such litigation is filed. In > -$ addition, If Recipient institutes patent litigation > -$ against any entity (including a cross-claim or > -$ counterclaim in a lawsuit) alleging that the Program > -$ itself (excluding combinations of the Program with other > -$ software or hardware) infringes such Recipient's > -$ patent(s), then such Recipient's rights granted under > -$ Section 2(b) shall terminate as of the date such > -$ litigation is filed. > -$ > -$ All Recipient's rights under this Agreement shall > -$ terminate if it fails to comply with any of the material > -$ terms or conditions of this Agreement and does not cure > -$ such failure in a reasonable period of time after becoming > -$ aware of such noncompliance. If all Recipient's rights > -$ under this Agreement terminate, Recipient agrees to cease > -$ use and distribution of the Program as soon as reasonably > -$ practicable. However, Recipient's obligations under this > -$ Agreement and any licenses granted by Recipient relating > -$ to the Program shall continue and survive. > -$ > -$ Everyone is permitted to copy and distribute copies of > -$ this Agreement, but in order to avoid inconsistency the > -$ Agreement is copyrighted and may only be modified in the > -$ following manner. The Agreement Steward reserves the right > -$ to publish new versions (including revisions) of this > -$ Agreement from time to time. No one other than the > -$ Agreement Steward has the right to modify this Agreement. > -$ > -$ IBM is the initial Agreement Steward. IBM may assign the > -$ responsibility to serve as the Agreement Steward to a > -$ suitable separate entity. Each new version of the > -$ Agreement will be given a distinguishing version number. > -$ The Program (including Contributions) may always be > -$ distributed subject to the version of the Agreement under > -$ which it was received. In addition, after a new version of > -$ the Agreement is published, Contributor may elect to > -$ distribute the Program (including its Contributions) under > -$ the new version. Except as expressly stated in Sections > -$ 2(a) and 2(b) above, Recipient receives no rights or > -$ licenses to the intellectual property of any Contributor > -$ under this Agreement, whether expressly, by implication, > -$ estoppel or otherwise. All rights in the Program not > -$ expressly granted under this Agreement are reserved. > -$ > -$ > -$ This Agreement is governed by the laws of the State of New > -$ York and the intellectual property laws of the United > -$ States of America. No party to this Agreement will bring a > -$ legal action under this Agreement more than one year after > -$ the cause of action arose. Each party waives its rights to > -$ a jury trial in any resulting litigation. > -$ > -$ > -$ > -$*/ > -$ > -$/* (C) COPYRIGHT International Business Machines Corp. 2001 */ > - > - > - > -$ > -$ COMPONENT_NAME: pkcs11 > -$ > - > -$ messages for init > -$quote " define quote character > -$len > -$set MS_PKCSINIT Define initial set# > - > -EXCLUSION "Setting the SO and user PINs are mutually exclusive.\n" > -SOPIN "Enter the SO PIN: " > -USERPIN "Enter the user PIN: " > -NEWUSER "Enter the new user PIN: " > -NEWSO "Enter the new SO PIN: " > -VNEWUSER "Re-enter the new user PIN: " > -VNEWSO "Re-enter the new SO PIN: " > -GETLABEL "Enter a unique token label: " > -INCORRECTPIN "Invalid PIN Entered." > -PINMISMATCH "New PINs do not match.\n" > - > -SHMEM "Shared Memory Data\n" > -SLOTNUMS "\tNumber of Slots: %d\n" > -SLOTNUM "\tSlot Number: %d\n" > -PRESENT "\tPresent: %d\n" > -DLLLOC "\tDLL Location: %s\n" > -INITFCN "\tInit Function: %s\n" > -COORELATE "\tCoorelator: %s\n" > -GLOBAL "\tGlobal Sessions: 0x%X\n" > - > -INFOERROR "Error getting PKCS#11 info: 0x%X\n" > -PKCSINFO "PKCS#11 Info\n" > -VERSION "\tVersion %d.%d\n" > -MANUFACT "\tManufacuter: %.32s\n" > -FLAGS "\tFlags: 0x%X\n" > -LIBDESCRIPT "\tLibrary Description: %.32s\n" > -LIBVERSION "\tLibrary Version %d.d\n" > - > -SLOTERROR "Error getting the number of slots: 0x%X\n" > -LISTERROR "Error getting the slot list: 0x%X\n" > -MECHERROR "Error getting the number of mechanisms: 0x%X\n" > -LISTERROR2 "Error getting the mechanism list: 0x%X\n" > -INFOERROR2 "Error getting mechanism info: 0x%X\n" > -MECH "Mechanism #%d\n" > -MECHLABEL "\tMechanism: 0x%X\n" > -KEYSIZE "\tKey Size: %d-%d\n" > - > -SLOTERROR2 "Error getting slot info: 0x%X\n" > -SLOTINFO "Slot #%d Info\n" > -SLOTDESC "\tDescription: %.64s\n" > -HWVERSION "\tHardware Version: %d.%d\n" > -FWVERSION "\tFirmware Version: %d.%d\n" > - > -TOKERROR "Error getting token info: 0x%X\n" > -TOKINFO "Token #%d Info:\n" > -TOKLABEL "\tLabel: %.32s\n" > -MODEL "\tModel: %.16s\n" > -SERIAL "\tSerial Number: %.16s\n" > -SESSIONS "\tSessions: %d/%d\n" > -RWSESSIONS "\tR/W Sessions: %d/%d\n" > -PINLEN "\tPIN Length: %d-%d\n" > -PUBMEM "\tPublic Memory: 0x%X/0x%X\n" > -PRIVMEM "\tPrivate Memory: 0x%X/0x%X\n" > -TIME "\tTime: %.16s\n" > - > -INITERROR "Error Initializing Token: 0x%X\n" > -OPENERROR "Error opening session: 0x%X\n" > -LOGINERROR "Error logging in: 0x%X\n" > -SETPIN "Error setting PIN: 0x%X\n" > -LOGOUTERROR "Error logging out: 0x%X\n" > -CLOSEERROR "Error closing session: 0x%X\n" > -LOADERROR "Error loading PKCS#11 library: 0x%X\n" > -FUNCTERROR "Error getting function list: 0x%X\n" > -LIBERROR "Error initializing the PKCS11 library: 0x%X\n" > -SLOTMGRERROR "Error communicating with slot manager: 0x%X\n" > -INVALIDCARD "Invalid card: %s\n" > - > -USAGE "usage:\t%s [-iImMpPstuh] [-c slotnumber -U userPIN -S > SOPin -n newPIN]\n" > -USAGE1 "\t-i display PKCS11 info\n" > -USAGE2 "\t-t display token info\n" > -USAGE3 "\t-s display slot info\n" > -USAGE4 "\t-m display mechanism list\n" > -USAGE5 "\t-M display shared memory\n" > -USAGE6 "\t-I initialize token\n" > -USAGE7 "\t-u initialize user PIN\n" > -USAGE8 "\t-p set the user PIN\n" > -USAGE9 "\t-P set the SO PIN\n" > -USAGE10 "\t-h show this help\n" > diff --git a/usr/sbin/pkcsconf/pkcsconf_msg.h > b/usr/sbin/pkcsconf/pkcsconf_msg.h > index f33630a..cccc28f 100755 > --- a/usr/sbin/pkcsconf/pkcsconf_msg.h > +++ b/usr/sbin/pkcsconf/pkcsconf_msg.h > @@ -301,10 +301,6 @@ > #define MF_PKCSCONF "pkcsconf.cat" > > > - > -/* The following was generated from > ../../../../../../../../src/bos/usr/lib/pkcs11/methods/pkcsconf/pkcsconf.msg. > */ > - > - > /* definitions for set MS_PKCSINIT */ > #define MS_PKCSINIT 1 > > -- > 1.7.2.2 > > > ------------------------------------------------------------------------------ > Start uncovering the many advantages of virtual appliances > and start using them to simplify application deployment and > accelerate your shift to cloud computing. > http://p.sf.net/sfu/novell-sfdev2dev > _______________________________________________ > Opencryptoki-tech mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
