"make update"

[openssl.git] / rsaref / rsaref.h

diff --git a/rsaref/rsaref.h b/rsaref/rsaref.h
index c264e288c93ec164383213b4de799bc49951f77b..15f65dd94f8d2b7e1e447ce8709e32f0d7a44d75 100644 (file)
--- a/rsaref/rsaref.h
+++ b/rsaref/rsaref.h
@@ -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. */
@@ -178,7 +172,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