diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 06:58:56 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 06:58:56 +0000 |
| commit | 21b4346ab38a024e4b957f3a656af1c6fbb46fc4 (patch) | |
| tree | 5a79c3cd3deeb446e17e58f42b23107620772a19 /sbin | |
| parent | c227fd4b19d3b669b6e6def5e1bd03eae8be5110 (diff) | |
Merge with EOM 1.9
author: niklas
Style
author: ho
Nowadays we can use #include <openssl/...> instead of <ssl/...>
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/apps/certpatch/certpatch.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sbin/isakmpd/apps/certpatch/certpatch.c b/sbin/isakmpd/apps/certpatch/certpatch.c index 47d671a0418..0d2c9041812 100644 --- a/sbin/isakmpd/apps/certpatch/certpatch.c +++ b/sbin/isakmpd/apps/certpatch/certpatch.c @@ -1,9 +1,10 @@ -/* $OpenBSD: certpatch.c,v 1.8 2000/03/08 08:42:27 niklas Exp $ */ -/* $EOM: certpatch.c,v 1.7 2000/03/08 02:47:45 ho Exp $ */ +/* $OpenBSD: certpatch.c,v 1.9 2000/10/07 06:58:55 niklas Exp $ */ +/* $EOM: certpatch.c,v 1.9 2000/09/28 12:53:37 niklas Exp $ */ /* * Copyright (c) 1999 Niels Provos. All rights reserved. * Copyright (c) 1999, 2000 Angelos D. Keromytis. All rights reserved. + * Copyright (c) 2000 Niklas Hallqvist. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -64,14 +65,13 @@ # ifdef CRYPTO # include <openssl/rsa.h> # endif -# include <openssl/x509.h> -# include <openssl/pem.h> #else -# include <ssl/rsa.h> -# include <ssl/x509.h> -# include <ssl/pem.h> +# include <openssl/rsa.h> #endif +#include <openssl/x509.h> +#include <openssl/pem.h> + #include "conf.h" #include "log.h" #include "ipsec_num.h" @@ -80,6 +80,7 @@ #define IDTYPE_IP "ip" #define IDTYPE_FQDN "fqdn" #define IDTYPE_UFQDN "ufqdn" + int main (int argc, char **argv) { |