generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Recent changes from 0.9.6-stable

Browse Source
This commit is contained in:
Richard Levitte 2002-12-03 23:23:11 +00:00
parent 22b3a95d5c
commit c99f9b8ff3
34 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/asn1pars.c
View File

@ -328,6 +328,6 @@ end:
if (at != NULL) ASN1_TYPE_free(at); if (at != NULL) ASN1_TYPE_free(at);
if (osk != NULL) sk_free(osk); if (osk != NULL) sk_free(osk);
OBJ_cleanup(); OBJ_cleanup();
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/ca.c
View File

@ -1307,7 +1307,7 @@ err:
X509_CRL_free(crl); X509_CRL_free(crl);
CONF_free(conf); CONF_free(conf);
OBJ_cleanup(); OBJ_cleanup();
EXIT(ret); OPENSSL_EXIT(ret);
} }
static void lookup_fail(char *name, char *tag) static void lookup_fail(char *name, char *tag)

2
apps/ciphers.c
View File

@ -202,6 +202,6 @@ end:
if (ctx != NULL) SSL_CTX_free(ctx); if (ctx != NULL) SSL_CTX_free(ctx);
if (ssl != NULL) SSL_free(ssl); if (ssl != NULL) SSL_free(ssl);
if (STDout != NULL) BIO_free_all(STDout); if (STDout != NULL) BIO_free_all(STDout);
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/crl.c
View File

@ -364,7 +364,7 @@ end:
X509_STORE_CTX_cleanup(&ctx); X509_STORE_CTX_cleanup(&ctx);
X509_STORE_free(store); X509_STORE_free(store);
} }
EXIT(ret); OPENSSL_EXIT(ret);
} }
static X509_CRL *load_crl(char *infile, int format) static X509_CRL *load_crl(char *infile, int format)

4
apps/crl2p7.c
View File

@ -166,7 +166,7 @@ bad:
BIO_printf(bio_err," -certfile arg certificates file of chain to a trusted CA\n"); BIO_printf(bio_err," -certfile arg certificates file of chain to a trusted CA\n");
BIO_printf(bio_err," (can be used more than once)\n"); BIO_printf(bio_err," (can be used more than once)\n");
BIO_printf(bio_err," -nocrl no crl to load, just certs from '-certfile'\n"); BIO_printf(bio_err," -nocrl no crl to load, just certs from '-certfile'\n");
EXIT(1); OPENSSL_EXIT(1);
} }
ERR_load_crypto_strings(); ERR_load_crypto_strings();
@ -278,7 +278,7 @@ end:
if (p7 != NULL) PKCS7_free(p7); if (p7 != NULL) PKCS7_free(p7);
if (crl != NULL) X509_CRL_free(crl); if (crl != NULL) X509_CRL_free(crl);
EXIT(ret); OPENSSL_EXIT(ret);
} }
/* /*

2
apps/dgst.c
View File

@ -362,7 +362,7 @@ end:
EVP_PKEY_free(sigkey); EVP_PKEY_free(sigkey);
if(sigbuf) OPENSSL_free(sigbuf); if(sigbuf) OPENSSL_free(sigbuf);
if (bmd != NULL) BIO_free(bmd); if (bmd != NULL) BIO_free(bmd);
EXIT(err); OPENSSL_EXIT(err);
} }
void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

2
apps/dh.c
View File

@ -346,6 +346,6 @@ end:
if (in != NULL) BIO_free(in); if (in != NULL) BIO_free(in);
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh); if (dh != NULL) DH_free(dh);
EXIT(ret); OPENSSL_EXIT(ret);
} }
#endif #endif

2
apps/dhparam.c
View File

@ -532,7 +532,7 @@ end:
if (in != NULL) BIO_free(in); if (in != NULL) BIO_free(in);
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh); if (dh != NULL) DH_free(dh);
EXIT(ret); OPENSSL_EXIT(ret);
} }
/* dh_cb is identical to dsa_cb in apps/dsaparam.c */ /* dh_cb is identical to dsa_cb in apps/dsaparam.c */

2
apps/dsa.c
View File

@ -320,6 +320,6 @@ end:
if(dsa != NULL) DSA_free(dsa); if(dsa != NULL) DSA_free(dsa);
if(passin) OPENSSL_free(passin); if(passin) OPENSSL_free(passin);
if(passout) OPENSSL_free(passout); if(passout) OPENSSL_free(passout);
EXIT(ret); OPENSSL_EXIT(ret);
} }
#endif #endif

2
apps/dsaparam.c
View File

@ -357,7 +357,7 @@ end:
if (in != NULL) BIO_free(in); if (in != NULL) BIO_free(in);
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (dsa != NULL) DSA_free(dsa); if (dsa != NULL) DSA_free(dsa);
EXIT(ret); OPENSSL_EXIT(ret);
} }
static void MS_CALLBACK dsa_cb(int p, int n, void *arg) static void MS_CALLBACK dsa_cb(int p, int n, void *arg)

2
apps/enc.c
View File

@ -631,7 +631,7 @@ end:
if (benc != NULL) BIO_free(benc); if (benc != NULL) BIO_free(benc);
if (b64 != NULL) BIO_free(b64); if (b64 != NULL) BIO_free(b64);
if(pass) OPENSSL_free(pass); if(pass) OPENSSL_free(pass);
EXIT(ret); OPENSSL_EXIT(ret);
} }
int set_hex(char *in, unsigned char *out, int size) int set_hex(char *in, unsigned char *out, int size)

2
apps/errstr.c
View File

@ -121,5 +121,5 @@ int MAIN(int argc, char **argv)
ret++; ret++;
} }
} }
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/gendh.c
View File

@ -211,7 +211,7 @@ end:
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (dh != NULL) DH_free(dh); if (dh != NULL) DH_free(dh);
EXIT(ret); OPENSSL_EXIT(ret);
} }
static void MS_CALLBACK dh_cb(int p, int n, void *arg) static void MS_CALLBACK dh_cb(int p, int n, void *arg)

2
apps/gendsa.c
View File

@ -247,6 +247,6 @@ end:
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (dsa != NULL) DSA_free(dsa); if (dsa != NULL) DSA_free(dsa);
if(passout) OPENSSL_free(passout); if(passout) OPENSSL_free(passout);
EXIT(ret); OPENSSL_EXIT(ret);
} }
#endif #endif

2
apps/genrsa.c
View File

@ -252,7 +252,7 @@ err:
if(passout) OPENSSL_free(passout); if(passout) OPENSSL_free(passout);
if (ret != 0) if (ret != 0)
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
EXIT(ret); OPENSSL_EXIT(ret);
} }
static void MS_CALLBACK genrsa_cb(int p, int n, void *arg) static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)

4
apps/nseq.c
View File

@ -102,7 +102,7 @@ int MAIN(int argc, char **argv)
BIO_printf (bio_err, "-in file input file\n"); BIO_printf (bio_err, "-in file input file\n");
BIO_printf (bio_err, "-out file output file\n"); BIO_printf (bio_err, "-out file output file\n");
BIO_printf (bio_err, "-toseq output NS Sequence file\n"); BIO_printf (bio_err, "-toseq output NS Sequence file\n");
EXIT(1); OPENSSL_EXIT(1);
} }
if (infile) { if (infile) {
@ -162,6 +162,6 @@ end:
BIO_free_all(out); BIO_free_all(out);
NETSCAPE_CERT_SEQUENCE_free(seq); NETSCAPE_CERT_SEQUENCE_free(seq);
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/openssl.c
View File

@ -215,7 +215,7 @@ end:
BIO_free(bio_err); BIO_free(bio_err);
bio_err=NULL; bio_err=NULL;
} }
EXIT(ret); OPENSSL_EXIT(ret);
} }
#define LIST_STANDARD_COMMANDS "list-standard-commands" #define LIST_STANDARD_COMMANDS "list-standard-commands"

4
apps/passwd.c
View File

@ -284,7 +284,7 @@ err:
BIO_free(in); BIO_free(in);
if (out) if (out)
BIO_free_all(out); BIO_free_all(out);
EXIT(ret); OPENSSL_EXIT(ret);
} }
@ -498,6 +498,6 @@ err:
int MAIN(int argc, char **argv) int MAIN(int argc, char **argv)
{ {
fputs("Program not available.\n", stderr) fputs("Program not available.\n", stderr)
EXIT(1); OPENSSL_EXIT(1);
} }
#endif #endif

2
apps/pkcs12.c
View File

@ -689,7 +689,7 @@ int MAIN(int argc, char **argv)
if (canames) sk_free(canames); if (canames) sk_free(canames);
if(passin) OPENSSL_free(passin); if(passin) OPENSSL_free(passin);
if(passout) OPENSSL_free(passout); if(passout) OPENSSL_free(passout);
EXIT(ret); OPENSSL_EXIT(ret);
} }
int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass, int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,

4
apps/pkcs7.c
View File

@ -163,7 +163,7 @@ bad:
BIO_printf(bio_err," -text print full details of certificates\n"); BIO_printf(bio_err," -text print full details of certificates\n");
BIO_printf(bio_err," -noout don't output encoded data\n"); BIO_printf(bio_err," -noout don't output encoded data\n");
BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n"); BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n");
EXIT(1); OPENSSL_EXIT(1);
} }
ERR_load_crypto_strings(); ERR_load_crypto_strings();
@ -316,5 +316,5 @@ end:
if (p7 != NULL) PKCS7_free(p7); if (p7 != NULL) PKCS7_free(p7);
if (in != NULL) BIO_free(in); if (in != NULL) BIO_free(in);
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/rand.c
View File

@ -173,5 +173,5 @@ err:
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
if (out) if (out)
BIO_free_all(out); BIO_free_all(out);
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/req.c
View File

@ -949,7 +949,7 @@ end:
#ifndef NO_DSA #ifndef NO_DSA
if (dsa_params != NULL) DSA_free(dsa_params); if (dsa_params != NULL) DSA_free(dsa_params);
#endif #endif
EXIT(ex); OPENSSL_EXIT(ex);
} }
static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, int attribs) static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, int attribs)

2
apps/rsa.c
View File

@ -416,7 +416,7 @@ end:
if(rsa != NULL) RSA_free(rsa); if(rsa != NULL) RSA_free(rsa);
if(passin) OPENSSL_free(passin); if(passin) OPENSSL_free(passin);
if(passout) OPENSSL_free(passout); if(passout) OPENSSL_free(passout);
EXIT(ret); OPENSSL_EXIT(ret);
} }
#else /* !NO_RSA */ #else /* !NO_RSA */

2
apps/s_client.c
View File

@ -807,7 +807,7 @@ end:
BIO_free(bio_c_out); BIO_free(bio_c_out);
bio_c_out=NULL; bio_c_out=NULL;
} }
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/s_server.c
View File

@ -775,7 +775,7 @@ end:
BIO_free(bio_s_out); BIO_free(bio_s_out);
bio_s_out=NULL; bio_s_out=NULL;
} }
EXIT(ret); OPENSSL_EXIT(ret);
} }
static void print_stats(BIO *bio, SSL_CTX *ssl_ctx) static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)

4
apps/s_time.c
View File

@ -461,7 +461,7 @@ int MAIN(int argc, char **argv)
if (tm_cipher == NULL ) { if (tm_cipher == NULL ) {
fprintf( stderr, "No CIPHER specified\n" ); fprintf( stderr, "No CIPHER specified\n" );
/* EXIT(1); */ /* OPENSSL_EXIT(1); */
} }
if (!(perform & 1)) goto next; if (!(perform & 1)) goto next;
@ -628,7 +628,7 @@ end:
SSL_CTX_free(tm_ctx); SSL_CTX_free(tm_ctx);
tm_ctx=NULL; tm_ctx=NULL;
} }
EXIT(ret); OPENSSL_EXIT(ret);
} }
/*********************************************************************** /***********************************************************************

2
apps/sess_id.c
View File

@ -272,7 +272,7 @@ bad:
end: end:
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (x != NULL) SSL_SESSION_free(x); if (x != NULL) SSL_SESSION_free(x);
EXIT(ret); OPENSSL_EXIT(ret);
} }
static SSL_SESSION *load_sess_id(char *infile, int format) static SSL_SESSION *load_sess_id(char *infile, int format)

2
apps/speed.c
View File

@ -1447,7 +1447,7 @@ end:
if (dsa_key[i] != NULL) if (dsa_key[i] != NULL)
DSA_free(dsa_key[i]); DSA_free(dsa_key[i]);
#endif #endif
EXIT(mret); OPENSSL_EXIT(mret);
} }
static void print_message(char *s, long num, int length) static void print_message(char *s, long num, int length)

2
apps/spkac.c
View File

@ -315,5 +315,5 @@ end:
BIO_free(key); BIO_free(key);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
if(passin) OPENSSL_free(passin); if(passin) OPENSSL_free(passin);
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/verify.c
View File

@ -239,7 +239,7 @@ end:
if (cert_ctx != NULL) X509_STORE_free(cert_ctx); if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
sk_X509_pop_free(untrusted, X509_free); sk_X509_pop_free(untrusted, X509_free);
sk_X509_pop_free(trusted, X509_free); sk_X509_pop_free(trusted, X509_free);
EXIT(ret); OPENSSL_EXIT(ret);
} }
static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose) static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose)

2
apps/version.c
View File

@ -128,5 +128,5 @@ int MAIN(int argc, char **argv)
} }
if (cflags) printf("%s\n",SSLeay_version(SSLEAY_CFLAGS)); if (cflags) printf("%s\n",SSLeay_version(SSLEAY_CFLAGS));
end: end:
EXIT(ret); OPENSSL_EXIT(ret);
} }

2
apps/x509.c
View File

@ -988,7 +988,7 @@ end:
sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
if (passin) OPENSSL_free(passin); if (passin) OPENSSL_free(passin);
EXIT(ret); OPENSSL_EXIT(ret);
} }
static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,

2
crypto/mem_clr.c
View File

@ -68,7 +68,7 @@ void OPENSSL_cleanse(void *ptr, size_t len)
while(loop--) while(loop--)
{ {
*(p++) = cleanse_ctr; *(p++) = cleanse_ctr;
cleanse_ctr += (17 + (((unsigned char *)&p)[sizeof(unsigned char *)-1] & 0xF)); cleanse_ctr += (17 + (unsigned char)((int)p & 0xF));
} }
if(memchr(ptr, cleanse_ctr, len)) if(memchr(ptr, cleanse_ctr, len))
cleanse_ctr += 63; cleanse_ctr += 63;

30
e_os.h
View File

@ -219,10 +219,11 @@ extern "C" {
# define _kbhit kbhit # define _kbhit kbhit
# endif # endif
# if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) # if defined(WIN16) && defined(SSLEAY) && defined(_WINEXITNOPERSIST)
# define EXIT(n) do { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } while(0) # define EXIT(n) _wsetexit(_WINEXITNOPERSIST)
# define OPENSSL_EXIT(n) do { if (n == 0) EXIT(n); return(n); } while(0)
# else # else
# define EXIT(n) return(n) # define EXIT(n) return(n)
# endif # endif
# define LIST_SEPARATOR_CHAR ';' # define LIST_SEPARATOR_CHAR ';'
# ifndef X_OK # ifndef X_OK
@ -275,18 +276,13 @@ extern "C" {
the status is tagged as an error, which I believe is what is wanted here. the status is tagged as an error, which I believe is what is wanted here.
-- Richard Levitte -- Richard Levitte
*/ */
# if !defined(MONOLITH) || defined(OPENSSL_C) # define EXIT(n) do { int __VMS_EXIT = n; \
# define EXIT(n) do { int __VMS_EXIT = n; \
if (__VMS_EXIT == 0) \ if (__VMS_EXIT == 0) \
__VMS_EXIT = 1; \ __VMS_EXIT = 1; \
else \ else \
__VMS_EXIT = (n << 3) | 2; \ __VMS_EXIT = (n << 3) | 2; \
__VMS_EXIT |= 0x10000000; \ __VMS_EXIT |= 0x10000000; \
exit(__VMS_EXIT); \ exit(__VMS_EXIT); } while(0)
return(__VMS_EXIT); } while(0)
# else
# define EXIT(n) return(n)
# endif
# define NO_SYS_PARAM_H # define NO_SYS_PARAM_H
# else # else
/* !defined VMS */ /* !defined VMS */
@ -317,11 +313,7 @@ extern "C" {
# define RFILE ".rnd" # define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ':' # define LIST_SEPARATOR_CHAR ':'
# define NUL_DEV "/dev/null" # define NUL_DEV "/dev/null"
# ifndef MONOLITH # define EXIT(n) exit(n)
# define EXIT(n) do { exit(n); return(n); } while(0)
# else
# define EXIT(n) return(n)
# endif
# endif # endif
# define SSLeay_getpid() getpid() # define SSLeay_getpid() getpid()
@ -441,6 +433,14 @@ extern char *sys_errlist[]; extern int sys_nerr;
(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
#endif #endif
#ifndef OPENSSL_EXIT
# if defined(MONOLITH) && !defined(OPENSSL_C)
# define OPENSSL_EXIT(n) return(n)
# else
# define OPENSSL_EXIT(n) do { EXIT(n); return(n); } while(0)
# endif
#endif
/***********************************************/ /***********************************************/
/* do we need to do this for getenv. /* do we need to do this for getenv.