projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix more unused value warnings.
[oweals/openssl.git]
/
apps
/
gendh.c
diff --git
a/apps/gendh.c
b/apps/gendh.c
index 98ee413c74b716c82bf2f0f0ad2ea404cd2bb031..47497864b0024d8c774598a4bdf01a1cdc4f1151 100644
(file)
--- a/
apps/gendh.c
+++ b/
apps/gendh.c
@@
-57,6
+57,13
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
+#include <openssl/opensslconf.h>
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
+#ifdef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
+#endif
+
#ifndef OPENSSL_NO_DH
#include <stdio.h>
#include <string.h>
#ifndef OPENSSL_NO_DH
#include <stdio.h>
#include <string.h>
@@
-75,23
+82,29
@@
#undef PROG
#define PROG gendh_main
#undef PROG
#define PROG gendh_main
-static
void MS_CALLBACK dh_cb(int p, int n, void *arg
);
+static
int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb
);
int MAIN(int, char **);
int MAIN(int argc, char **argv)
{
int MAIN(int, char **);
int MAIN(int argc, char **argv)
{
+ BN_GENCB cb;
+#ifndef OPENSSL_NO_ENGINE
ENGINE *e = NULL;
ENGINE *e = NULL;
+#endif
DH *dh=NULL;
int ret=1,num=DEFBITS;
int g=2;
char *outfile=NULL;
char *inrand=NULL;
DH *dh=NULL;
int ret=1,num=DEFBITS;
int g=2;
char *outfile=NULL;
char *inrand=NULL;
+#ifndef OPENSSL_NO_ENGINE
char *engine=NULL;
char *engine=NULL;
+#endif
BIO *out=NULL;
apps_startup();
BIO *out=NULL;
apps_startup();
+ BN_GENCB_set(&cb, dh_cb, bio_err);
if (bio_err == NULL)
if ((bio_err=BIO_new(BIO_s_file())) != NULL)
BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
if (bio_err == NULL)
if ((bio_err=BIO_new(BIO_s_file())) != NULL)
BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
@@
-115,11
+128,13
@@
int MAIN(int argc, char **argv)
g=3; */
else if (strcmp(*argv,"-5") == 0)
g=5;
g=3; */
else if (strcmp(*argv,"-5") == 0)
g=5;
+#ifndef OPENSSL_NO_ENGINE
else if (strcmp(*argv,"-engine") == 0)
{
if (--argc < 1) goto bad;
engine= *(++argv);
}
else if (strcmp(*argv,"-engine") == 0)
{
if (--argc < 1) goto bad;
engine= *(++argv);
}
+#endif
else if (strcmp(*argv,"-rand") == 0)
{
if (--argc < 1) goto bad;
else if (strcmp(*argv,"-rand") == 0)
{
if (--argc < 1) goto bad;
@@
-138,14
+153,18
@@
bad:
BIO_printf(bio_err," -2 - use 2 as the generator value\n");
/* BIO_printf(bio_err," -3 - use 3 as the generator value\n"); */
BIO_printf(bio_err," -5 - use 5 as the generator value\n");
BIO_printf(bio_err," -2 - use 2 as the generator value\n");
/* BIO_printf(bio_err," -3 - use 3 as the generator value\n"); */
BIO_printf(bio_err," -5 - use 5 as the generator value\n");
+#ifndef OPENSSL_NO_ENGINE
BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+#endif
BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
BIO_printf(bio_err," - load the file (or the files in the directory) into\n");
BIO_printf(bio_err," the random number generator\n");
goto end;
}
BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
BIO_printf(bio_err," - load the file (or the files in the directory) into\n");
BIO_printf(bio_err," the random number generator\n");
goto end;
}
+#ifndef OPENSSL_NO_ENGINE
e = setup_engine(bio_err, engine, 0);
e = setup_engine(bio_err, engine, 0);
+#endif
out=BIO_new(BIO_s_file());
if (out == NULL)
out=BIO_new(BIO_s_file());
if (out == NULL)
@@
-183,10
+202,10
@@
bad:
BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
BIO_printf(bio_err,"This is going to take a long time\n");
BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
BIO_printf(bio_err,"This is going to take a long time\n");
- dh=DH_generate_parameters(num,g,dh_cb,bio_err);
-
- if (dh == NULL) goto end;
+ if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, &cb))
+ goto end;
+
app_RAND_write_file(NULL, bio_err);
if (!PEM_write_bio_DHparams(out,dh))
app_RAND_write_file(NULL, bio_err);
if (!PEM_write_bio_DHparams(out,dh))
@@
-201,7
+220,7
@@
end:
OPENSSL_EXIT(ret);
}
OPENSSL_EXIT(ret);
}
-static
void MS_CALLBACK dh_cb(int p, int n, void *arg
)
+static
int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb
)
{
char c='*';
{
char c='*';
@@
-209,10
+228,11
@@
static void MS_CALLBACK dh_cb(int p, int n, void *arg)
if (p == 1) c='+';
if (p == 2) c='*';
if (p == 3) c='\n';
if (p == 1) c='+';
if (p == 2) c='*';
if (p == 3) c='\n';
- BIO_write(
(BIO *)
arg,&c,1);
- (void)BIO_flush(
(BIO *)
arg);
+ BIO_write(
cb->
arg,&c,1);
+ (void)BIO_flush(
cb->
arg);
#ifdef LINT
p=n;
#endif
#ifdef LINT
p=n;
#endif
+ return 1;
}
#endif
}
#endif