diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-04-24 04:15:18 +0400 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-04-24 04:15:18 +0400 |
commit | 6d31193858f176c276fe5f27d36408977933c1d6 (patch) | |
tree | 111d45fb6403491f47cbeed5293016e46b4400b2 /rsaref | |
parent | dd3c43c5323d236a42efb1c7d6b509b927747953 (diff) |
Complete rewrite of the error code generation script. It now runs as a single
script, translates function codes better and doesn't need the K&R function
prototypes to work (NB. the K&R prototypes can't be wiped just yet: they are
still needed by the DEF generator...). I also ran the script with the -rewrite
option to update all the header and source files.
Diffstat (limited to 'rsaref')
-rw-r--r-- | rsaref/Makefile.ssl | 6 | ||||
-rw-r--r-- | rsaref/rsar_err.c | 130 | ||||
-rw-r--r-- | rsaref/rsaref.err | 32 | ||||
-rw-r--r-- | rsaref/rsaref.h | 6 |
4 files changed, 64 insertions, 110 deletions
diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl index 45479b8a35..1b16b881df 100644 --- a/rsaref/Makefile.ssl +++ b/rsaref/Makefile.ssl @@ -77,12 +77,6 @@ dclean: clean: rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff -errors: $(ERRC).c - -$(ERRC).c: $(ERR).err - $(PERL) $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - $(PERL) ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c - # DO NOT DELETE THIS LINE -- make depend depends on it. rsar_err.o: ../include/openssl/bn.h ../include/openssl/crypto.h diff --git a/rsaref/rsar_err.c b/rsaref/rsar_err.c index a512ba481a..d2eb3a2b01 100644 --- a/rsaref/rsar_err.c +++ b/rsaref/rsar_err.c @@ -1,60 +1,62 @@ -/* lib/rsaref/rsaref_err.c */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) - * All rights reserved. +/* rsaref/rsar_err.c */ +/* ==================================================================== + * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * 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 OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * */ + +/* NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file. + */ + #include <stdio.h> #include <openssl/err.h> #include <openssl/rsaref.h> @@ -66,35 +68,21 @@ static ERR_STRING_DATA RSAREF_str_functs[]= {ERR_PACK(0,RSAREF_F_BN_REF_MOD_EXP,0), "BN_REF_MOD_EXP"}, {ERR_PACK(0,RSAREF_F_RSAREF_BN2BIN,0), "RSAREF_BN2BIN"}, {ERR_PACK(0,RSAREF_F_RSA_BN2BIN,0), "RSA_BN2BIN"}, -{ERR_PACK(0,RSAREF_F_RSA_PRIVATE_DECRYPT,0), "RSA_PRIVATE_DECRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_PRIVATE_ENCRYPT,0), "RSA_PRIVATE_ENCRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_PUBLIC_DECRYPT,0), "RSA_PUBLIC_DECRYPT"}, -{ERR_PACK(0,RSAREF_F_RSA_PUBLIC_ENCRYPT,0), "RSA_PUBLIC_ENCRYPT"}, +{ERR_PACK(0,RSAREF_F_RSA_PRIVATE_DECRYPT,0), "RSA_private_decrypt"}, +{ERR_PACK(0,RSAREF_F_RSA_PRIVATE_ENCRYPT,0), "RSA_private_encrypt"}, +{ERR_PACK(0,RSAREF_F_RSA_PUBLIC_DECRYPT,0), "RSA_public_decrypt"}, +{ERR_PACK(0,RSAREF_F_RSA_PUBLIC_ENCRYPT,0), "RSA_public_encrypt"}, {ERR_PACK(0,RSAREF_F_RSA_REF_BN2BIN,0), "RSA_REF_BN2BIN"}, {ERR_PACK(0,RSAREF_F_RSA_REF_MOD_EXP,0), "RSA_REF_MOD_EXP"}, {ERR_PACK(0,RSAREF_F_RSA_REF_PRIVATE_DECRYPT,0), "RSA_REF_PRIVATE_DECRYPT"}, {ERR_PACK(0,RSAREF_F_RSA_REF_PRIVATE_ENCRYPT,0), "RSA_REF_PRIVATE_ENCRYPT"}, {ERR_PACK(0,RSAREF_F_RSA_REF_PUBLIC_DECRYPT,0), "RSA_REF_PUBLIC_DECRYPT"}, {ERR_PACK(0,RSAREF_F_RSA_REF_PUBLIC_ENCRYPT,0), "RSA_REF_PUBLIC_ENCRYPT"}, -{0,NULL}, +{0,NULL} }; static ERR_STRING_DATA RSAREF_str_reasons[]= { -{RE_CONTENT_ENCODING ,"content encoding"}, -{RE_DATA ,"data"}, -{RE_DIGEST_ALGORITHM ,"digest algorithm"}, -{RE_ENCODING ,"encoding"}, -{RE_KEY ,"key"}, -{RE_KEY_ENCODING ,"key encoding"}, -{RE_LEN ,"len"}, -{RE_MODULUS_LEN ,"modulus len"}, -{RE_NEED_RANDOM ,"need random"}, -{RE_PRIVATE_KEY ,"private key"}, -{RE_PUBLIC_KEY ,"public key"}, -{RE_SIGNATURE ,"signature"}, -{RE_SIGNATURE_ENCODING ,"signature encoding"}, -{RE_ENCRYPTION_ALGORITHM ,"encryption algorithm"}, {RSAREF_R_CONTENT_ENCODING ,"content encoding"}, {RSAREF_R_DATA ,"data"}, {RSAREF_R_DIGEST_ALGORITHM ,"digest algorithm"}, @@ -109,7 +97,7 @@ static ERR_STRING_DATA RSAREF_str_reasons[]= {RSAREF_R_PUBLIC_KEY ,"public key"}, {RSAREF_R_SIGNATURE ,"signature"}, {RSAREF_R_SIGNATURE_ENCODING ,"signature encoding"}, -{0,NULL}, +{0,NULL} }; #endif diff --git a/rsaref/rsaref.err b/rsaref/rsaref.err deleted file mode 100644 index ee02cdae76..0000000000 --- a/rsaref/rsaref.err +++ /dev/null @@ -1,32 +0,0 @@ -/* Error codes for the RSAREF functions. */ - -/* Function codes. */ -#define RSAREF_F_BN_REF_MOD_EXP 100 -#define RSAREF_F_RSAREF_BN2BIN 101 -#define RSAREF_F_RSA_BN2BIN 102 -#define RSAREF_F_RSA_PRIVATE_DECRYPT 103 -#define RSAREF_F_RSA_PRIVATE_ENCRYPT 104 -#define RSAREF_F_RSA_PUBLIC_DECRYPT 105 -#define RSAREF_F_RSA_PUBLIC_ENCRYPT 106 -#define RSAREF_F_RSA_REF_BN2BIN 107 -#define RSAREF_F_RSA_REF_MOD_EXP 108 -#define RSAREF_F_RSA_REF_PRIVATE_DECRYPT 109 -#define RSAREF_F_RSA_REF_PRIVATE_ENCRYPT 110 -#define RSAREF_F_RSA_REF_PUBLIC_DECRYPT 111 -#define RSAREF_F_RSA_REF_PUBLIC_ENCRYPT 112 - -/* Reason codes. */ -#define RSAREF_R_CONTENT_ENCODING 0x0400 -#define RSAREF_R_DATA 0x0401 -#define RSAREF_R_DIGEST_ALGORITHM 0x0402 -#define RSAREF_R_ENCODING 0x0403 -#define RSAREF_R_ENCRYPTION_ALGORITHM 0x040d -#define RSAREF_R_KEY 0x0404 -#define RSAREF_R_KEY_ENCODING 0x0405 -#define RSAREF_R_LEN 0x0406 -#define RSAREF_R_MODULUS_LEN 0x0407 -#define RSAREF_R_NEED_RANDOM 0x0408 -#define RSAREF_R_PRIVATE_KEY 0x0409 -#define RSAREF_R_PUBLIC_KEY 0x040a -#define RSAREF_R_SIGNATURE 0x040b -#define RSAREF_R_SIGNATURE_ENCODING 0x040c diff --git a/rsaref/rsaref.h b/rsaref/rsaref.h index 8e91027848..336c95eaaa 100644 --- a/rsaref/rsaref.h +++ b/rsaref/rsaref.h @@ -146,6 +146,10 @@ RSA_METHOD *RSA_PKCS1_RSAref(); #endif /* BEGIN ERROR CODES */ +/* The following lines are auto generated by the script mkerr.pl. Any changes + * made after this point may be overwritten when the script is next run. + */ + /* Error codes for the RSAREF functions. */ /* Function codes. */ @@ -178,7 +182,7 @@ RSA_METHOD *RSA_PKCS1_RSAref(); #define RSAREF_R_PUBLIC_KEY 0x040a #define RSAREF_R_SIGNATURE 0x040b #define RSAREF_R_SIGNATURE_ENCODING 0x040c - + #ifdef __cplusplus } #endif |