From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 15 Sep 2008 21:27:23 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9a0ab4907fae6288a100e2efcd3e8bcce48eaec;p=oweals%2Fopenssl.git

Update from stable branch.
---

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 64d9d719b6..c5e0703860 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -319,6 +319,7 @@ int	RSA_print_fp(FILE *fp, const RSA *r,int offset);
 int	RSA_print(BIO *bp, const RSA *r,int offset);
 #endif
 
+#ifndef OPENSSL_NO_RC4
 int i2d_RSA_NET(const RSA *a, unsigned char **pp,
 		int (*cb)(char *buf, int len, const char *prompt, int verify),
 		int sgckey);
@@ -332,6 +333,7 @@ int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
 RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
 		      int (*cb)(char *buf, int len, const char *prompt,
 				int verify));
+#endif
 
 /* The following 2 functions sign and verify a X509_SIG ASN1 object
  * inside PKCS#1 padded RSA encryption */