Add missing #ifndefs that caused missing symbols when building libssl

[openssl.git] / apps / req.c

diff --git a/apps/req.c b/apps/req.c
index 00ce23103366d9cf8899a1301f06bfea053fafa5..5d4092507b5af33f2fc142227ef330e557af91ca 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -91,7 +91,7 @@
 #undef PROG
 #define PROG   req_main
 
-/* -inform arg - input format - default PEM (one of DER, TXT or PEM)
+/* -inform arg - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout
@@ -120,7 +120,9 @@ static int add_attribute_object(STACK_OF(X509_ATTRIBUTE) *n, char *text,
                                int max);
 static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
        int nid,int min,int max);
+#ifndef NO_RSA
 static void MS_CALLBACK req_cb(int p,int n,void *arg);
+#endif
 static int req_fix_data(int nid,int *type,int len,int min,int max);
 static int check_end(char *str, char *end);
 static int add_oid_section(LHASH *conf);
@@ -375,8 +377,8 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options  are\n");
-               BIO_printf(bio_err," -inform arg    input format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -outform arg   output format - one of DER TXT PEM\n");
+               BIO_printf(bio_err," -inform arg    input format - DER or PEM\n");
+               BIO_printf(bio_err," -outform arg   output format - DER or PEM\n");
                BIO_printf(bio_err," -in arg        input file\n");
                BIO_printf(bio_err," -out arg       output file\n");
                BIO_printf(bio_err," -text          text form of request\n");
@@ -1403,6 +1405,7 @@ err:
        return(0);
        }
 
+#ifndef NO_RSA
 static void MS_CALLBACK req_cb(int p, int n, void *arg)
        {
        char c='*';
@@ -1417,6 +1420,7 @@ static void MS_CALLBACK req_cb(int p, int n, void *arg)
        p=n;
 #endif
        }
+#endif
 
 static int req_fix_data(int nid, int *type, int len, int min, int max)
        {