From afda1385bd032a33b6b9af6242cfeb4ea70b2778 Mon Sep 17 00:00:00 2001 From: Nils Larsch Date: Fri, 22 Dec 2006 09:21:29 +0000 Subject: [PATCH] use OPENSSL_NO_DYNAMIC_ENGINE macro, disable debug messages PR: 1440 Submitted by: Victor B. Wagner" --- engines/ccgost/gost_eng.c | 4 ++-- engines/ccgost/gost_pmeth.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c index 68bf485bc9..0c47253e2a 100644 --- a/engines/ccgost/gost_eng.c +++ b/engines/ccgost/gost_eng.c @@ -141,10 +141,10 @@ static int bind_gost (ENGINE *e,const char *id) return ret; } -#ifdef ENGINE_DYNAMIC_SUPPORT +#ifndef OPENSSL_NO_DYNAMIC_ENGINE IMPLEMENT_DYNAMIC_BIND_FN(bind_gost) IMPLEMENT_DYNAMIC_CHECK_FN() -#endif /* def ENGINE_DYNAMIC_SUPPORT */ +#endif /* ndef OPENSSL_NO_DYNAMIC_ENGINE */ static int gost_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c index cf0435e515..26ac02c8ce 100644 --- a/engines/ccgost/gost_pmeth.c +++ b/engines/ccgost/gost_pmeth.c @@ -446,11 +446,13 @@ static int pkey_gost01_cc_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, int ok = 0; EVP_PKEY* pub_key = EVP_PKEY_CTX_get0_pkey(ctx); DSA_SIG *s=unpack_cc_signature(sig,siglen); +#ifdef DEBUG_SIGN fprintf(stderr,"R="); BN_print_fp(stderr,s->r); fprintf(stderr,"\nS="); BN_print_fp(stderr,s->s); fprintf(stderr,"\n"); +#endif if (!s) return 0; if (pub_key) ok = gost2001_do_verify(tbs,tbs_len,s,EVP_PKEY_get0(pub_key)); DSA_SIG_free(s); @@ -464,11 +466,13 @@ static int pkey_gost01_cp_verify(EVP_PKEY_CTX *ctx, const unsigned char *sig, EVP_PKEY* pub_key = EVP_PKEY_CTX_get0_pkey(ctx); DSA_SIG *s=unpack_cp_signature(sig,siglen); if (!s) return 0; +#ifdef DEBUG_SIGN fprintf(stderr,"R="); BN_print_fp(stderr,s->r); fprintf(stderr,"\nS="); BN_print_fp(stderr,s->s); fprintf(stderr,"\n"); +#endif if (pub_key) ok = gost2001_do_verify(tbs,tbs_len,s,EVP_PKEY_get0(pub_key)); DSA_SIG_free(s); return ok; -- 2.25.1