Make NO_RSA compile with pedantic.

[openssl.git] / rsaref / rsaref.h

diff --git a/rsaref/rsaref.h b/rsaref/rsaref.h
index 52fc469daba70f5ec638ddf343d3cfa63fbf29c0..15f65dd94f8d2b7e1e447ce8709e32f0d7a44d75 100644 (file)
--- 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
@@ -59,7 +59,12 @@
 #ifndef HEADER_RSAREF_H
 #define HEADER_RSAREF_H
 
-#include "rsa.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+ 
+#ifndef NO_RSA
+#include <openssl/rsa.h>
 
 /* RSAeuro */
 /*#define  RSAref_MAX_BITS             2048*/
@@ -113,7 +118,6 @@ typedef struct RSARandomState_st
 #define RE_SIGNATURE_ENCODING 0x040c
 #define RE_ENCRYPTION_ALGORITHM 0x040d
 
-#ifndef NOPROTO
 int RSAPrivateDecrypt(unsigned char *to, int *outlen, unsigned char *from,
        int len, RSArefPrivateKey *RSAkey);
 int RSAPrivateEncrypt(unsigned char *to, int *outlen, unsigned char *from,
@@ -129,23 +133,13 @@ int R_RandomFinal(RSARandomState *rnd);
 
 void ERR_load_RSAREF_strings(void );
 RSA_METHOD *RSA_PKCS1_RSAref(void );
-
-#else
-int RSAPrivateDecrypt();
-int RSAPrivateEncrypt();
-int RSAPublicDecrypt();
-int RSAPublicEncrypt();
-int R_RandomInit();
-int R_GetRandomBytesNeeded();
-int R_RandomUpdate();
-int R_RandomFinal();
-
-void ERR_load_RSAREF_strings();
-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. */
@@ -164,21 +158,21 @@ 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
 }
 #endif