summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-19 20:01:49 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-19 20:01:49 +0000
commit011409068b8b29272e4ecb8717115904728d3ae6 (patch)
tree28b93ae76f994260f9d16536fc12307c1c943b62 /sbin
parentcc4bac2657069d07e4814dbcae4d47c000a46d9c (diff)
./asn.h: Merge with EOM 1.18
1999 Name change so we can #define free
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/asn.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/isakmpd/asn.h b/sbin/isakmpd/asn.h
index 51ae28993ee..4e161687a36 100644
--- a/sbin/isakmpd/asn.h
+++ b/sbin/isakmpd/asn.h
@@ -1,8 +1,9 @@
-/* $OpenBSD: asn.h,v 1.3 1998/11/17 11:10:07 niklas Exp $ */
-/* $EOM: asn.h,v 1.16 1998/08/21 13:47:56 provos Exp $ */
+/* $OpenBSD: asn.h,v 1.4 1999/04/19 20:01:48 niklas Exp $ */
+/* $EOM: asn.h,v 1.18 1999/04/05 18:27:32 niklas Exp $ */
/*
* Copyright (c) 1998 Niels Provos. All rights reserved.
+ * Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -85,7 +86,7 @@ struct asn_objectid {
struct asn_handler {
enum asn_tags type;
- void (*free) (struct norm_type *);
+ void (*deallocate) (struct norm_type *);
u_int32_t (*get_encoded_len) (struct norm_type *, u_int8_t *type);
u_int8_t *(*decode) (u_int8_t *, u_int32_t, struct norm_type *);
u_int8_t *(*encode) (struct norm_type *, u_int8_t *);