diff options
| -rw-r--r-- | crypto/asn1/tasn_prn.c | 4 | ||||
| -rw-r--r-- | crypto/evp/openbsd_hw.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index a0c71ea992..fab67ae5ac 100644 --- a/crypto/asn1/tasn_prn.c +++ b/crypto/asn1/tasn_prn.c @@ -134,7 +134,9 @@ static int asn1_item_print_nm(BIO *out, void *fld, int indent, const ASN1_ITEM * int ASN1_template_print(BIO *out, void *fld, int indent, const ASN1_TEMPLATE *tt) { int i, flags; - //if(!fld) return 0; +#if 0 + if(!fld) return 0; +#endif flags = tt->flags; if(flags & ASN1_TFLG_SK_MASK) { char *tname; diff --git a/crypto/evp/openbsd_hw.c b/crypto/evp/openbsd_hw.c index fe2a721f17..dfee5ca2bb 100644 --- a/crypto/evp/openbsd_hw.c +++ b/crypto/evp/openbsd_hw.c @@ -59,7 +59,7 @@ #include "evp_locl.h" #include <assert.h> -// longest key supported in hardware +/* longest key supported in hardware */ #define MAX_HW_KEY 24 static int fd; @@ -115,14 +115,14 @@ static int dev_crypto_cleanup(EVP_CIPHER_CTX *ctx) return 1; } -// FIXME: there should be some non-fatal way to report we fell back to s/w? +/* FIXME: there should be some non-fatal way to report we fell back to s/w? */ static int dev_crypto_des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc) { if(!dev_crypto_init(ctx)) { - // fall back to using software... + /* fall back to using software... */ ctx->cipher=EVP_des_ede3_cbc(); return ctx->cipher->init(ctx,key,iv,enc); } @@ -135,7 +135,7 @@ static int dev_crypto_des_ede3_init_key(EVP_CIPHER_CTX *ctx, if (ioctl(fd,CIOCGSESSION,ctx->c.dev_crypto) == -1) { err("CIOCGSESSION failed"); - // fall back to using software... + /* fall back to using software... */ dev_crypto_cleanup(ctx); ctx->cipher=EVP_des_ede3_cbc(); return ctx->cipher->init(ctx,key,iv,enc); @@ -158,7 +158,9 @@ static int dev_crypto_des_ede3_cbc_cipher(EVP_CIPHER_CTX *ctx, cryp.ses=ctx->c.dev_crypto->ses; cryp.op=ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT; cryp.flags=0; - // cryp.len=((inl+7)/8)*8; +#if 0 + cryp.len=((inl+7)/8)*8; +#endif cryp.len=inl; assert((inl&7) == 0); cryp.src=(caddr_t)in; |