[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/engine fix some merg...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6231943882ea
branches:  trunk
changeset: 761636:6231943882ea
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu Feb 03 19:44:05 2011 +0000

description:
fix some merge botch and enable cryptodev support on NetBSD again

diffstat:

 crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 1e0277242864 -r 6231943882ea crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c
--- a/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c    Thu Feb 03 17:21:17 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c    Thu Feb 03 19:44:05 2011 +0000
@@ -33,7 +33,7 @@
 #include <openssl/bn.h>
 
 #if (defined(__unix__) || defined(unix)) && !defined(USG) && \
-       (defined(OpenBSD) || defined(__FreeBSD__))
+       (defined(OpenBSD) || defined(__FreeBSD__)) || defined(__NetBSD__)
 #include <sys/param.h>
 # if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041) || defined(__NetBSD__)
 #  define HAVE_CRYPTODEV
@@ -193,8 +193,6 @@
        static int fd = -1;
 
        if (fd == -1)
-               fd = get_dev_crypto();
-       if (fd == -1)
                fd = open_dev_crypto();
        return fd;
 }
@@ -910,7 +908,7 @@
                return (-1);
 
        for (i = 0; i < bytes; i++)
-               pd[i] = crp->crp_p[bytes - i - 1];
+               pd[i] = ((char *)crp->crp_p)[bytes - i - 1];
 
        BN_bin2bn(pd, bytes, a);
        free(pd);
@@ -936,7 +934,7 @@
 {
        int fd, ret = -1;
 
-       if ((fd = get_asym_dev_crypto()) < 0)
+       if ((fd = get_dev_crypto()) < 0)
                return (ret);
 
        if (r) {