Avoid GNU C assembler templates under Solaris x86.

[openssl.git] / rsaref / rsaref.h

diff --git a/rsaref/rsaref.h b/rsaref/rsaref.h
index 336c95eaaa5fd00585ade885d0ce6e8320e389d5..15f65dd94f8d2b7e1e447ce8709e32f0d7a44d75 100644 (file)
--- a/rsaref/rsaref.h
+++ b/rsaref/rsaref.h
@@ -59,6 +59,11 @@
 #ifndef HEADER_RSAREF_H
 #define HEADER_RSAREF_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+ 
+#ifndef NO_RSA
 #include <openssl/rsa.h>
 
 /* RSAeuro */
@@ -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,20 +133,6 @@ 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 */