summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/crypto/cryptosoft.c6
-rw-r--r--sys/crypto/xform.c8
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c
index 5803f554d9e..d6950b34321 100644
--- a/sys/crypto/cryptosoft.c
+++ b/sys/crypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptosoft.c,v 1.27 2001/07/05 17:53:28 deraadt Exp $ */
+/* $OpenBSD: cryptosoft.c,v 1.28 2001/08/08 15:12:09 jjbg Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -455,9 +455,7 @@ swcr_newsession(u_int32_t *sid, struct cryptoini *cri)
struct swcr_data **swd;
struct auth_hash *axf;
struct enc_xform *txf;
-#ifdef IPCOMP
struct comp_algo *cxf;
-#endif
u_int32_t i;
int k;
@@ -620,12 +618,10 @@ swcr_newsession(u_int32_t *sid, struct cryptoini *cri)
(*swd)->sw_axf = axf;
break;
-#ifdef IPCOMP
case CRYPTO_DEFLATE_COMP:
cxf = &comp_algo_deflate;
(*swd)->sw_cxf = cxf;
break;
-#endif
default:
swcr_freesession(i);
return EINVAL;
diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c
index 0c014b6ca53..c431cff0ea3 100644
--- a/sys/crypto/xform.c
+++ b/sys/crypto/xform.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xform.c,v 1.12 2001/07/05 17:53:28 deraadt Exp $ */
+/* $OpenBSD: xform.c,v 1.13 2001/08/08 15:12:09 jjbg Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -183,14 +183,12 @@ struct auth_hash auth_hash_key_sha1 = {
(void (*)(u_int8_t *, void *)) SHA1Final
};
-#ifdef IPCOMP
/* Compression instance */
struct comp_algo comp_algo_deflate = {
CRYPTO_DEFLATE_COMP, "Deflate",
90, deflate_compress,
deflate_decompress
};
-#endif
/*
* Encryption wrapper routines.
@@ -403,8 +401,6 @@ SHA1Update_int(void *ctx, u_int8_t *buf, u_int16_t len)
return 0;
}
-#ifdef IPCOMP
-
/*
* And compression
*/
@@ -426,5 +422,3 @@ deflate_decompress(data, size, out)
{
return deflate_global(data, size, 1, out);
}
-
-#endif