RT2914: NULL check missing in X509_name_canon

[openssl.git] / test / methtest.c

diff --git a/test/methtest.c b/test/methtest.c
index 55d1ac79346ec6c521a35b9e9d411d6d9fc8aeb9..b73421783c85d19303f61a744dd576ac6c02c111 100644 (file)
--- a/test/methtest.c
+++ b/test/methtest.c
@@ -1,5 +1,5 @@
 /* test/methtest.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,10 +58,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rsa.h"
-#include "x509.h"
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
 #include "meth.h"
-#include "err.h"
+#include <openssl/err.h>
 
 int main(argc,argv)
 int argc;
@@ -84,7 +84,7 @@ char *argv[];
        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);
+/*-    tmp=METH_new(x509_by_issuer_dir);
        METH_arg(tmp,METH_TYPE_DIR,"/home/eay/.mycerts");
        METH_push(top,METH_X509_BY_ISSUER,tmp);
 
@@ -96,10 +96,10 @@ char *argv[];
        METH_init(top);
        METH_control(tmp1,METH_CONTROL_DUMP,stdout);
        METH_control(tmp2,METH_CONTROL_DUMP,stdout);
-       exit(0);
+       EXIT(0);
 err:
        ERR_load_crypto_strings();
        ERR_print_errors_fp(stderr);
-       exit(1);
+       EXIT(1);
        return(0);
        }