diff options
author | Bodo Möller <bodo@openssl.org> | 2002-03-14 09:52:03 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2002-03-14 09:52:03 +0000 |
commit | 690ecff7953193cc8e66b588216805f3014df778 (patch) | |
tree | c21fb14c3d0b01ae50dd4c9d8a485b8824d78e35 /crypto | |
parent | 234c73767daf1dfadbdbff3f884d7cfffff2846c (diff) | |
download | openssl-690ecff7953193cc8e66b588216805f3014df778.tar.gz |
Fixes for 'no-hw' combined with 'no-SOME_CIPHER'.
Fix dsaparam usage output.
Submitted by: Nils Larsch
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/x_pubkey.c | 4 | ||||
-rw-r--r-- | crypto/ecdsa/ecdsatest.c | 15 | ||||
-rw-r--r-- | crypto/engine/engine.h | 2 | ||||
-rw-r--r-- | crypto/engine/hw_4758_cca.c | 8 | ||||
-rw-r--r-- | crypto/engine/hw_sureware.c | 8 | ||||
-rw-r--r-- | crypto/evp/evp_pkey.c | 10 |
6 files changed, 26 insertions, 21 deletions
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 227b0ce046..f6f2a0daca 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -212,7 +212,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) long j; int type; unsigned char *p; -#ifndef OPENSSL_NO_DSA +#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) const unsigned char *cp; X509_ALGOR *a; #endif @@ -237,7 +237,9 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key) /* the parameters must be extracted before the public key (ECDSA!) */ +#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) a=key->algor; +#endif if (0) ; diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c index 02f9df923f..18b0ce18b3 100644 --- a/crypto/ecdsa/ecdsatest.c +++ b/crypto/ecdsa/ecdsatest.c @@ -56,13 +56,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <openssl/crypto.h> -#include <openssl/bio.h> -#include <openssl/evp.h> -#include <openssl/x509.h> -#include <openssl/ecdsa.h> -#include <openssl/engine.h> -#include <openssl/err.h> #ifdef CLOCKS_PER_SEC /* "To determine the time in seconds, the value returned @@ -81,6 +74,14 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); return 0; } #else +#include <openssl/crypto.h> +#include <openssl/bio.h> +#include <openssl/evp.h> +#include <openssl/x509.h> +#include <openssl/ecdsa.h> +#include <openssl/engine.h> +#include <openssl/err.h> + static BIO *bio_err=NULL; static const char rnd_seed[] = "string to make the random number generator think it has entropy"; diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index 6c8b0437f8..1cd27f8422 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -92,7 +92,7 @@ typedef void DSA_METHOD; #ifdef OPENSSL_NO_DH typedef void DH_METHOD; #endif -#ifdef OPENSS_NO_ECDSA +#ifdef OPENSSL_NO_ECDSA typedef void ECDSA_METHOD; #endif diff --git a/crypto/engine/hw_4758_cca.c b/crypto/engine/hw_4758_cca.c index a42baf0a54..959d8f1a61 100644 --- a/crypto/engine/hw_4758_cca.c +++ b/crypto/engine/hw_4758_cca.c @@ -62,8 +62,8 @@ #include <openssl/objects.h> #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_4758_CCA +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_4758_CCA #ifdef FLAT_INC #include "hw_4758_cca.h" @@ -946,5 +946,5 @@ IMPLEMENT_DYNAMIC_CHECK_FN() IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) #endif /* ENGINE_DYNAMIC_SUPPORT */ -#endif /* !NO_HW_4758_CCA */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_4758_CCA */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/engine/hw_sureware.c b/crypto/engine/hw_sureware.c index 3d2ff36033..8ef473c8d3 100644 --- a/crypto/engine/hw_sureware.c +++ b/crypto/engine/hw_sureware.c @@ -59,8 +59,8 @@ #include "engine.h" #include <openssl/engine.h> -#ifndef NO_HW -#ifndef NO_HW_SUREWARE +#ifndef OPENSSL_NO_HW +#ifndef OPENSSL_NO_HW_SUREWARE #ifdef FLAT_INC #include "sureware.h" @@ -962,5 +962,5 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, } return ret; } -#endif /* !NO_HW_SureWare */ -#endif /* !NO_HW */ +#endif /* !OPENSSL_NO_HW_SureWare */ +#endif /* !OPENSSL_NO_HW */ diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index 15d4d66721..3577837fa9 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -83,7 +83,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) #ifndef OPENSSL_NO_ECDSA ECDSA *ecdsa = NULL; #endif -#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_ECDSA) +#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) ASN1_INTEGER *privkey; ASN1_TYPE *t1, *t2, *param = NULL; STACK_OF(ASN1_TYPE) *n_stack = NULL; @@ -92,9 +92,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) #endif X509_ALGOR *a; unsigned char *p; -#ifndef OPENSSL_NO_RSA const unsigned char *cp; -#endif int pkeylen; int nid; char obj_tmp[80]; @@ -126,7 +124,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) EVP_PKEY_assign_RSA (pkey, rsa); break; #endif -#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_ECDSA) +#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) case NID_ecdsa_with_SHA1: case NID_dsa: /* PKCS#8 DSA/ECDSA is weird: you just get a private key integer @@ -279,8 +277,12 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8) err: if (ctx) BN_CTX_free(ctx); sk_ASN1_TYPE_pop_free(n_stack, ASN1_TYPE_free); +#ifndef OPENSSL_NO_DSA if (dsa) DSA_free(dsa); +#endif +#ifndef OPENSSL_NO_ECDSA if (ecdsa) ECDSA_free(ecdsa); +#endif if (pkey) EVP_PKEY_free(pkey); return NULL; break; |