From c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 14:43:31 +0100 Subject: Upgraded to openssl-1.0.2 --- openssl/test/methtest.c | 76 +++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 37 deletions(-) (limited to 'openssl/test/methtest.c') diff --git a/openssl/test/methtest.c b/openssl/test/methtest.c index 005c2f482..de66c1063 100644 --- a/openssl/test/methtest.c +++ b/openssl/test/methtest.c @@ -5,21 +5,21 @@ * This package is an SSL implementation written * by Eric Young (eay@cryptsoft.com). * The implementation was written so as to conform with Netscapes SSL. - * + * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * + * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,10 +34,10 @@ * Eric Young (eay@cryptsoft.com)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from + * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * + * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -49,7 +49,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence @@ -63,43 +63,45 @@ #include "meth.h" #include -int main(argc,argv) +int main(argc, argv) int argc; char *argv[]; - { - METHOD_CTX *top,*tmp1,*tmp2; +{ + METHOD_CTX *top, *tmp1, *tmp2; - top=METH_new(x509_lookup()); /* get a top level context */ - if (top == NULL) goto err; + top = METH_new(x509_lookup()); /* get a top level context */ + if (top == NULL) + goto err; - tmp1=METH_new(x509_by_file()); - if (top == NULL) goto err; - METH_arg(tmp1,METH_TYPE_FILE,"cafile1"); - METH_arg(tmp1,METH_TYPE_FILE,"cafile2"); - METH_push(top,METH_X509_CA_BY_SUBJECT,tmp1); + tmp1 = METH_new(x509_by_file()); + if (top == NULL) + goto err; + METH_arg(tmp1, METH_TYPE_FILE, "cafile1"); + METH_arg(tmp1, METH_TYPE_FILE, "cafile2"); + METH_push(top, METH_X509_CA_BY_SUBJECT, tmp1); - tmp2=METH_new(x509_by_dir()); - METH_arg(tmp2,METH_TYPE_DIR,"/home/eay/.CAcerts"); - METH_arg(tmp2,METH_TYPE_DIR,"/home/eay/SSLeay/certs"); - METH_arg(tmp2,METH_TYPE_DIR,"/usr/local/ssl/certs"); - METH_push(top,METH_X509_CA_BY_SUBJECT,tmp2); + tmp2 = METH_new(x509_by_dir()); + METH_arg(tmp2, METH_TYPE_DIR, "/home/eay/.CAcerts"); + METH_arg(tmp2, METH_TYPE_DIR, "/home/eay/SSLeay/certs"); + METH_arg(tmp2, METH_TYPE_DIR, "/usr/local/ssl/certs"); + METH_push(top, METH_X509_CA_BY_SUBJECT, tmp2); -/* tmp=METH_new(x509_by_issuer_dir); - METH_arg(tmp,METH_TYPE_DIR,"/home/eay/.mycerts"); - METH_push(top,METH_X509_BY_ISSUER,tmp); +/*- tmp=METH_new(x509_by_issuer_dir); + METH_arg(tmp,METH_TYPE_DIR,"/home/eay/.mycerts"); + METH_push(top,METH_X509_BY_ISSUER,tmp); - tmp=METH_new(x509_by_issuer_primary); - METH_arg(tmp,METH_TYPE_FILE,"/home/eay/.mycerts/primary.pem"); - METH_push(top,METH_X509_BY_ISSUER,tmp); + tmp=METH_new(x509_by_issuer_primary); + METH_arg(tmp,METH_TYPE_FILE,"/home/eay/.mycerts/primary.pem"); + METH_push(top,METH_X509_BY_ISSUER,tmp); */ - METH_init(top); - METH_control(tmp1,METH_CONTROL_DUMP,stdout); - METH_control(tmp2,METH_CONTROL_DUMP,stdout); - EXIT(0); -err: - ERR_load_crypto_strings(); - ERR_print_errors_fp(stderr); - EXIT(1); - return(0); - } + METH_init(top); + METH_control(tmp1, METH_CONTROL_DUMP, stdout); + METH_control(tmp2, METH_CONTROL_DUMP, stdout); + EXIT(0); + err: + ERR_load_crypto_strings(); + ERR_print_errors_fp(stderr); + EXIT(1); + return (0); +} -- cgit v1.2.3