diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-04-01 12:25:40 +0000 |
| commit | 0cedaa6c89235ed396068f2ebf546c9a909439e1 (patch) | |
| tree | ea91d9b180fa36b1886b046a286630c089f57475 /apps | |
| parent | f7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff) | |
| download | src-0cedaa6c89235ed396068f2ebf546c9a909439e1.tar.gz src-0cedaa6c89235ed396068f2ebf546c9a909439e1.zip | |
Import OpenSSL 0.9.8n.vendor/openssl/0.9.8n
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=206035
svn path=/vendor-crypto/openssl/0.9.8n/; revision=206037; tag=vendor/openssl/0.9.8n
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/req.c | 6 | ||||
| -rw-r--r-- | apps/speed.c | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/apps/req.c b/apps/req.c index 314197de839b..9f55cdeabd4c 100644 --- a/apps/req.c +++ b/apps/req.c @@ -1433,11 +1433,17 @@ start2: for (;;) BIO_snprintf(buf,sizeof buf,"%s_min",type); if (!NCONF_get_number(req_conf,attr_sect,buf, &n_min)) + { + ERR_clear_error(); n_min = -1; + } BIO_snprintf(buf,sizeof buf,"%s_max",type); if (!NCONF_get_number(req_conf,attr_sect,buf, &n_max)) + { + ERR_clear_error(); n_max = -1; + } if (!add_attribute_object(req, v->value,def,value,nid,n_min,n_max, chtype)) diff --git a/apps/speed.c b/apps/speed.c index 07f0ae04a614..393a7baade38 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -254,12 +254,18 @@ # endif #endif -#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE) -# define NO_FORK 1 -#elif HAVE_FORK +#ifndef HAVE_FORK +# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE) +# define HAVE_FORK 0 +# else +# define HAVE_FORK 1 +# endif +#endif + +#if HAVE_FORK # undef NO_FORK #else -# define NO_FORK 1 +# define NO_FORK #endif #undef BUFSIZE |