diff options
Diffstat (limited to 'rsaref')
| -rw-r--r-- | rsaref/Makefile.ssl | 2 | ||||
| -rw-r--r-- | rsaref/rsar_err.c | 10 | ||||
| -rw-r--r-- | rsaref/rsaref.c | 4 | ||||
| -rw-r--r-- | rsaref/rsaref.err | 28 | ||||
| -rw-r--r-- | rsaref/rsaref.h | 30 |
5 files changed, 41 insertions, 33 deletions
diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl index e0e4fb735f..b816b89f66 100644 --- a/rsaref/Makefile.ssl +++ b/rsaref/Makefile.ssl @@ -80,6 +80,6 @@ clean: errors: perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../crypto/err/err_genc.pl $(ERR).h $(ERRC).c + perl ../crypto/err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/rsaref/rsar_err.c b/rsaref/rsar_err.c index b77f3e7c1a..34840e99f5 100644 --- a/rsaref/rsar_err.c +++ b/rsaref/rsar_err.c @@ -60,6 +60,7 @@ #include "rsaref.h" /* BEGIN ERROR CODES */ +#ifndef NO_ERR static ERR_STRING_DATA RSAREF_str_functs[]= { {ERR_PACK(0,RSAREF_F_BN_REF_MOD_EXP,0), "BN_REF_MOD_EXP"}, @@ -111,14 +112,19 @@ static ERR_STRING_DATA RSAREF_str_reasons[]= {0,NULL}, }; +#endif + void ERR_load_RSAREF_strings() { static int init=1; - if (init) - { + if (init); + {; init=0; +#ifndef NO_ERR ERR_load_strings(ERR_LIB_RSAREF,RSAREF_str_functs); ERR_load_strings(ERR_LIB_RSAREF,RSAREF_str_reasons); +#endif + } } diff --git a/rsaref/rsaref.c b/rsaref/rsaref.c index ac4fe01939..324460327d 100644 --- a/rsaref/rsaref.c +++ b/rsaref/rsaref.c @@ -1,5 +1,5 @@ /* rsaref/rsaref.c */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written @@ -126,6 +126,8 @@ static RSA_METHOD rsa_pkcs1_ref_meth={ BN_ref_mod_exp, NULL, NULL, + 0, + NULL, }; RSA_METHOD *RSA_PKCS1_RSAref() diff --git a/rsaref/rsaref.err b/rsaref/rsaref.err index 89f83b822c..ee02cdae76 100644 --- a/rsaref/rsaref.err +++ b/rsaref/rsaref.err @@ -16,17 +16,17 @@ #define RSAREF_F_RSA_REF_PUBLIC_ENCRYPT 112 /* Reason codes. */ -#define RSAREF_R_CONTENT_ENCODING 1024 -#define RSAREF_R_DATA 1025 -#define RSAREF_R_DIGEST_ALGORITHM 1026 -#define RSAREF_R_ENCODING 1027 -#define RSAREF_R_ENCRYPTION_ALGORITHM 1037 -#define RSAREF_R_KEY 1028 -#define RSAREF_R_KEY_ENCODING 1029 -#define RSAREF_R_LEN 1030 -#define RSAREF_R_MODULUS_LEN 1031 -#define RSAREF_R_NEED_RANDOM 1032 -#define RSAREF_R_PRIVATE_KEY 1033 -#define RSAREF_R_PUBLIC_KEY 1034 -#define RSAREF_R_SIGNATURE 1035 -#define RSAREF_R_SIGNATURE_ENCODING 1036 +#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 52fc469dab..c264e288c9 100644 --- a/rsaref/rsaref.h +++ b/rsaref/rsaref.h @@ -1,5 +1,5 @@ /* rsaref/rsaref.h */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written @@ -164,20 +164,20 @@ RSA_METHOD *RSA_PKCS1_RSAref(); #define RSAREF_F_RSA_REF_PUBLIC_ENCRYPT 112 /* Reason codes. */ -#define RSAREF_R_CONTENT_ENCODING 1024 -#define RSAREF_R_DATA 1025 -#define RSAREF_R_DIGEST_ALGORITHM 1026 -#define RSAREF_R_ENCODING 1027 -#define RSAREF_R_ENCRYPTION_ALGORITHM 1037 -#define RSAREF_R_KEY 1028 -#define RSAREF_R_KEY_ENCODING 1029 -#define RSAREF_R_LEN 1030 -#define RSAREF_R_MODULUS_LEN 1031 -#define RSAREF_R_NEED_RANDOM 1032 -#define RSAREF_R_PRIVATE_KEY 1033 -#define RSAREF_R_PUBLIC_KEY 1034 -#define RSAREF_R_SIGNATURE 1035 -#define RSAREF_R_SIGNATURE_ENCODING 1036 +#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 #ifdef __cplusplus } |