diff options
| author | kris <kris@FreeBSD.org> | 2001-05-20 03:17:35 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-05-20 03:17:35 +0000 |
| commit | 445c7928a166ddd374f98189e149d7e27092573e (patch) | |
| tree | 4127aa35b669d1fef973314beb69f8303022eb16 /crypto/openssl/apps | |
| parent | 8acf08a7904cd7fbf506f79a905bb8e29164019a (diff) | |
| download | FreeBSD-src-445c7928a166ddd374f98189e149d7e27092573e.zip FreeBSD-src-445c7928a166ddd374f98189e149d7e27092573e.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssl/apps')
| -rw-r--r-- | crypto/openssl/apps/speed.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 156d19f..4a42aeb 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -833,6 +833,7 @@ int MAIN(int argc, char **argv) } #endif +#ifndef NO_DSA dsa_c[R_DSA_512][0]=count/1000; dsa_c[R_DSA_512][1]=count/1000/2; for (i=1; i<DSA_NUM; i++) @@ -850,6 +851,7 @@ int MAIN(int argc, char **argv) } } } +#endif #define COND(d) (count < (d)) #define COUNT(d) (d) @@ -1175,7 +1177,7 @@ int MAIN(int argc, char **argv) { BIO_printf(bio_err,"RSA verify failure. No RSA verify will be done.\n"); ERR_print_errors(bio_err); - dsa_doit[j] = 0; + rsa_doit[j] = 0; } else { |
