X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fopenbsd_hw.c;h=7de06ba171d10def87f2968466b7aebe948eb324;hp=61f67720d732f7ea880b06a6241be0c2bbfea9c7;hb=0e36019977e78c34d6ea67b943fe17d4a01e769d;hpb=47c3448a97605a771fc5a2c9400eb7ccc27d70b3

diff --git a/crypto/evp/openbsd_hw.c b/crypto/evp/openbsd_hw.c
index 61f67720d7..7de06ba171 100644
--- a/crypto/evp/openbsd_hw.c
+++ b/crypto/evp/openbsd_hw.c
@@ -1,5 +1,6 @@
+/* Written by Ben Laurie, 2001 */
 /*
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -59,12 +60,16 @@
 #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;
 static int dev_failed;
 
+typedef struct session_op session_op;
+
+#define data(ctx) EVP_C_DATA(session_op,ctx)
+
 static void err(const char *str)
     {
     fprintf(stderr,"%s: errno %d\n",str,errno);
@@ -93,49 +98,44 @@ static int dev_crypto_init(EVP_CIPHER_CTX *ctx)
 	    }
 	close(cryptodev_fd);
 	}
-    if(!ctx->c.dev_crypto)
-	{
-	ctx->c.dev_crypto=OPENSSL_malloc(sizeof *ctx->c.dev_crypto);
-	memset(ctx->c.dev_crypto,'\0',sizeof *ctx->c.dev_crypto);
-	ctx->c.dev_crypto->key=OPENSSL_malloc(MAX_HW_KEY);
-	}
-    
+    assert(data(ctx));
+    memset(data(ctx),'\0',sizeof *data(ctx));
+    data(ctx)->key=OPENSSL_malloc(MAX_HW_KEY);
+
     return 1;
     }
 
 static int dev_crypto_cleanup(EVP_CIPHER_CTX *ctx)
     {
-    if(ioctl(fd,CIOCFSESSION,ctx->c.dev_crypto->ses) == -1)
+    if(ioctl(fd,CIOCFSESSION,&data(ctx)->ses) == -1)
 	err("CIOCFSESSION failed");
 
-    OPENSSL_free(ctx->c.dev_crypto->key);
-    OPENSSL_free(ctx->c.dev_crypto);
-    ctx->c.dev_crypto=NULL;
+    OPENSSL_free(data(ctx)->key);
 
     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);
 	}
-    memcpy(ctx->c.dev_crypto->key,key,24);
+    memcpy(data(ctx)->key,key,24);
     
-    ctx->c.dev_crypto->cipher=CRYPTO_3DES_CBC;
-    ctx->c.dev_crypto->mac=0;
-    ctx->c.dev_crypto->keylen=24;
+    data(ctx)->cipher=CRYPTO_3DES_CBC;
+    data(ctx)->mac=0;
+    data(ctx)->keylen=24;
 
-    if (ioctl(fd,CIOCGSESSION,ctx->c.dev_crypto) == -1)
+    if (ioctl(fd,CIOCGSESSION,data(ctx)) == -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);
@@ -151,14 +151,16 @@ static int dev_crypto_des_ede3_cbc_cipher(EVP_CIPHER_CTX *ctx,
     struct crypt_op cryp;
     unsigned char lb[8];
 
-    assert(ctx->c.dev_crypto);
+    assert(data(ctx));
     assert(!dev_failed);
 
     memset(&cryp,'\0',sizeof cryp);
-    cryp.ses=ctx->c.dev_crypto->ses;
+    cryp.ses=data(ctx)->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;
@@ -184,11 +186,12 @@ static int dev_crypto_des_ede3_cbc_cipher(EVP_CIPHER_CTX *ctx,
     return 1;
     }
 
-BLOCK_CIPHER_def_cbc(dev_crypto_des_ede3, des_ede,NID_des_ede3, 8, 24, 8,
+BLOCK_CIPHER_def_cbc(dev_crypto_des_ede3, session_op, NID_des_ede3, 8, 24, 8,
 		     0, dev_crypto_des_ede3_init_key,
 		     dev_crypto_cleanup, 
 		     EVP_CIPHER_set_asn1_iv,
 		     EVP_CIPHER_get_asn1_iv,
 		     NULL)
-
+#else
+static void *dummy=&dummy;
 #endif