projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#include <stdio.h> not needed.
[oweals/openssl.git]
/
crypto
/
dh
/
dh_check.c
diff --git
a/crypto/dh/dh_check.c
b/crypto/dh/dh_check.c
index 8da8dc839390184b801acfdd8353d5ff904a0a54..7e5cfd8bfcb367ef49d50680bde1f6f4da5e79c3 100644
(file)
--- a/
crypto/dh/dh_check.c
+++ b/
crypto/dh/dh_check.c
@@
-1,5
+1,5
@@
/* crypto/dh/dh_check.c */
/* crypto/dh/dh_check.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-58,10
+58,10
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"bn.h"
-#include
"dh.h"
+#include
<openssl/bn.h>
+#include
<openssl/dh.h>
-/* Check that p is a s
trong
prime and
+/* Check that p is a s
afe
prime and
* if g is 2, 3 or 5, check that is is a suitable generator
* where
* for 2, p mod 24 == 11
* if g is 2, 3 or 5, check that is is a suitable generator
* where
* for 2, p mod 24 == 11
@@
-70,9
+70,7
@@
* should hold.
*/
* should hold.
*/
-int DH_check(dh,ret)
-DH *dh;
-int *ret;
+int DH_check(DH *dh, int *ret)
{
int ok=0;
BN_CTX *ctx=NULL;
{
int ok=0;
BN_CTX *ctx=NULL;
@@
-90,11
+88,13
@@
int *ret;
l=BN_mod_word(dh->p,24);
if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
}
l=BN_mod_word(dh->p,24);
if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
}
-/* else if (BN_is_word(dh->g,DH_GENERATOR_3))
+#if 0
+ else if (BN_is_word(dh->g,DH_GENERATOR_3))
{
l=BN_mod_word(dh->p,12);
if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
{
l=BN_mod_word(dh->p,12);
if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
- }*/
+ }
+#endif
else if (BN_is_word(dh->g,DH_GENERATOR_5))
{
l=BN_mod_word(dh->p,10);
else if (BN_is_word(dh->g,DH_GENERATOR_5))
{
l=BN_mod_word(dh->p,10);
@@
-104,13
+104,13
@@
int *ret;
else
*ret|=DH_UNABLE_TO_CHECK_GENERATOR;
else
*ret|=DH_UNABLE_TO_CHECK_GENERATOR;
- if (!BN_is_prime(dh->p,BN_prime_checks,NULL,ctx))
+ if (!BN_is_prime(dh->p,BN_prime_checks,NULL,ctx
,NULL
))
*ret|=DH_CHECK_P_NOT_PRIME;
else
{
if (!BN_rshift1(q,dh->p)) goto err;
*ret|=DH_CHECK_P_NOT_PRIME;
else
{
if (!BN_rshift1(q,dh->p)) goto err;
- if (!BN_is_prime(q,BN_prime_checks,NULL,ctx))
- *ret|=DH_CHECK_P_NOT_S
TRONG
_PRIME;
+ if (!BN_is_prime(q,BN_prime_checks,NULL,ctx
,NULL
))
+ *ret|=DH_CHECK_P_NOT_S
AFE
_PRIME;
}
ok=1;
err:
}
ok=1;
err: