diff options
| author | Phil Sutter <phil.sutter@viprinet.com> | 2010-06-21 15:22:25 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-06-22 22:37:47 +0200 |
| commit | aaadfeb4517b66bbd59de39173f2d032aa1d8ea9 (patch) | |
| tree | d5b61ba046e6c17492d1963bcf722899225a1828 | |
| parent | 57434b3f1d6e62a5c8aacd471f0be6b5b986b580 (diff) | |
| download | cryptodev-linux-aaadfeb4517b66bbd59de39173f2d032aa1d8ea9.tar.gz cryptodev-linux-aaadfeb4517b66bbd59de39173f2d032aa1d8ea9.tar.xz cryptodev-linux-aaadfeb4517b66bbd59de39173f2d032aa1d8ea9.zip | |
compat: use compat_ptr() and ptr_to_compat()
| -rw-r--r-- | cryptodev_main.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c index abc1bde..00f598c 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -648,9 +648,9 @@ compat_to_session_op(struct compat_session_op *compat, struct session_op *sop) sop->mac = compat->mac; sop->keylen = compat->keylen; - sop->key = (uint8_t *)(unsigned long)compat->key; + sop->key = compat_ptr(compat->key); sop->mackeylen = compat->mackeylen; - sop->mackey = (uint8_t *)(unsigned long)compat->mackey; + sop->mackey = compat_ptr(compat->mackey); sop->ses = compat->ses; } @@ -661,9 +661,9 @@ session_op_to_compat(struct session_op *sop, struct compat_session_op *compat) compat->mac = sop->mac; compat->keylen = sop->keylen; - compat->key = (unsigned long)sop->key; + compat->key = ptr_to_compat(sop->key); compat->mackeylen = sop->mackeylen; - compat->mackey = (unsigned long)sop->mackey; + compat->mackey = ptr_to_compat(sop->mackey); compat->ses = sop->ses; } @@ -674,11 +674,11 @@ compat_to_crypt_op(struct compat_crypt_op *compat, struct crypt_op *cop) cop->op = compat->op; cop->flags = compat->flags; cop->len = compat->len; - - cop->src = (uint8_t *)(unsigned long)compat->src; - cop->dst = (uint8_t *)(unsigned long)compat->dst; - cop->mac = (uint8_t *)(unsigned long)compat->mac; - cop->iv = (uint8_t *)(unsigned long)compat->iv; + + cop->src = compat_ptr(compat->src); + cop->dst = compat_ptr(compat->dst); + cop->mac = compat_ptr(compat->mac); + cop->iv = compat_ptr(compat->iv); } static inline void @@ -689,10 +689,10 @@ crypt_op_to_compat(struct crypt_op *cop, struct compat_crypt_op *compat) compat->flags = cop->flags; compat->len = cop->len; - compat->src = (unsigned long)cop->src; - compat->dst = (unsigned long)cop->dst; - compat->mac = (unsigned long)cop->mac; - compat->iv = (unsigned long)cop->iv; + compat->src = ptr_to_compat(cop->src); + compat->dst = ptr_to_compat(cop->dst); + compat->mac = ptr_to_compat(cop->mac); + compat->iv = ptr_to_compat(cop->iv); } static long |