diff options
| author | Archie Cobbs <archie@FreeBSD.org> | 2000-01-26 01:55:28 +0000 |
|---|---|---|
| committer | Archie Cobbs <archie@FreeBSD.org> | 2000-01-26 01:55:28 +0000 |
| commit | a3dd62941f5a3293aace76538667e68ba52e12c4 (patch) | |
| tree | 9a66dfd2813b90bae64681c94871563c1efd38c6 /security/skip/files/patch-bx | |
| parent | We were forgetting to install "README.FreeBSD+NAT". (diff) | |
Bash this port until it compiles under -current again.
Notes
Notes:
svn path=/head/; revision=25078
Diffstat (limited to 'security/skip/files/patch-bx')
| -rw-r--r-- | security/skip/files/patch-bx | 63 |
1 files changed, 42 insertions, 21 deletions
diff --git a/security/skip/files/patch-bx b/security/skip/files/patch-bx index 95d228ac0fa3..f22f5dd212c3 100644 --- a/security/skip/files/patch-bx +++ b/security/skip/files/patch-bx @@ -1,21 +1,42 @@ -diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/keymgrd/skip_msgs.C work.new/skip/keymgrd/skip_msgs.C ---- skipsrc-1.0.orig/skip/keymgrd/skip_msgs.C Fri Oct 25 13:12:51 1996 -+++ work.new/skip/keymgrd/skip_msgs.C Mon Mar 8 21:33:38 1999 -@@ -82,7 +82,7 @@ - set.msgtype = SKIP_SET_CDP_SERVER_PORT; - set.port = cdp_port; - -- skip_log(SKIP_NOTICE, "Setting CDP port=%d", cdp_port); -+ skip_log(SKIP_INFO, "Setting CDP port=%d", cdp_port); - fflush(stdout); - - if (put_kernel_message(fd, &set, sizeof(set)) < 0) { -@@ -107,7 +107,7 @@ - set.version = version; - set.kij_alg = kij_alg; - -- skip_log(SKIP_NOTICE, "Setting supported kij alg=%d for version %d", -+ skip_log(SKIP_INFO, "Setting supported kij alg=%d for version %d", - kij_alg, version); - fflush(stdout); - +diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/include/skip_key.h work.new/skip/include/skip_key.h +--- skipsrc-1.0.orig/skip/include/skip_key.h Fri Oct 25 13:12:44 1996 ++++ work.new/skip/include/skip_key.h Mon Jan 24 12:35:40 2000 +@@ -209,24 +209,22 @@ + void *, skip_arg_t *) + ); + #endif +-void skip_close(); ++void skip_close(void *sd); + int skip_encrypt(void *, SKIP_BUF_T *, SKIP_BUF_T *, + skip_param_t *, void *); + int skip_decrypt(void *, SKIP_BUF_T *, SKIP_BUF_T *, + skip_hdr_t *hdr, int, void *); + int skip_key_check(skip_keycb_t *, void *); +-void skip_key_iterate(int (*)(), void *); ++void skip_key_iterate(int (*)(skip_keycb_t *, void *), void *); + int skip_hdr_encode(skip_hdr_t *, unsigned char *); + int skip_iv_encode(skip_hdr_t *, unsigned char *); + void skip_hdr_init(skip_keycb_t *); + +-void skip_key_tellkm(enum skip_msgs, skip_keycb_t *); +-void skip_key_fromkm(union skip_messages *, unsigned int); + void skip_update_encrypt_key(struct Encrypted_key_rsp *); + void skip_update_decrypt_key(struct Decrypted_key_rsp *); + +-void skip_local_keyid_init(); +-void skip_local_keyid_uninit(); ++void skip_local_keyid_init(void); ++void skip_local_keyid_uninit(void); + void skip_set_local_keyid(unsigned char , skip_key_var_t *); + int skip_check_keyid(unsigned char , skip_key_var_t *, boolean_t); + int skip_get_default_keyid(unsigned char, unsigned char *); +@@ -254,8 +252,8 @@ + * function prototypes + */ + void skip_key_fromkm(union skip_messages *, unsigned int); ++void skip_key_tellkm(enum skip_msgs, skip_keycb_t *); + #endif +- + + /* + * external variables |