diff options
| author | nectar <nectar@FreeBSD.org> | 2003-02-26 05:32:40 +0800 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-02-26 05:32:40 +0800 |
| commit | 2b0553a847d42334896a23d0f9d81f4cbd5c4d40 (patch) | |
| tree | 88c572a59b527eaffc1ff3f4295ee645c35d1217 /security | |
| parent | 898ad0aa1f7aa425175dcfbba0135df4e1e02e9b (diff) | |
| download | freebsd-ports-gnome-2b0553a847d42334896a23d0f9d81f4cbd5c4d40.tar.gz freebsd-ports-gnome-2b0553a847d42334896a23d0f9d81f4cbd5c4d40.tar.zst freebsd-ports-gnome-2b0553a847d42334896a23d0f9d81f4cbd5c4d40.zip | |
Fix building with OpenSSL 0.9.7.
Diffstat (limited to 'security')
| -rw-r--r-- | security/opensc/files/patch-src::libopensc::card-gpk.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/security/opensc/files/patch-src::libopensc::card-gpk.c b/security/opensc/files/patch-src::libopensc::card-gpk.c index 491b707f8d7d..328b0b111e69 100644 --- a/security/opensc/files/patch-src::libopensc::card-gpk.c +++ b/security/opensc/files/patch-src::libopensc::card-gpk.c @@ -1,5 +1,5 @@ ---- src/libopensc/card-gpk.c.orig Thu May 2 14:54:27 2002 -+++ src/libopensc/card-gpk.c Tue Sep 10 15:18:38 2002 +--- src/libopensc/card-gpk.c.orig Thu May 2 08:54:27 2002 ++++ src/libopensc/card-gpk.c Tue Feb 25 15:30:23 2003 @@ -35,6 +35,7 @@ GPK4000_s, GPK4000_sp, @@ -16,6 +16,28 @@ { "\x3B\x27\x00\x80\x65\xA2\x0C\x01\x01\x37", 10, GPK4000_su256 }, { "\x3B\xA7\x00\x40\x14\x80\x65\xA2\x14\x01\x01\x37", 12, GPK4000_sdo }, { "\x3B\xA7\x00\x40\x18\x80\x65\xA2\x08\x01\x01\x52", 12, GPK8000_8K }, +@@ -735,8 +737,8 @@ + apdu->le += 3; + if (crycks1) + memcpy(crycks1, out, 3); +- memset(k1, 0, sizeof(k1)); +- memset(k2, 0, sizeof(k2)); ++ memset(&k1, 0, sizeof(k1)); ++ memset(&k2, 0, sizeof(k2)); + memset(in, 0, sizeof(in)); + memset(out, 0, sizeof(out)); + memset(block, 0, sizeof(block)); +@@ -878,8 +880,8 @@ + if (memcmp(r_rn, out+4, 4) != 0) + r = SC_ERROR_INVALID_ARGUMENTS; + +- memset(k1, 0, sizeof(k1)); +- memset(k2, 0, sizeof(k2)); ++ memset(&k1, 0, sizeof(k1)); ++ memset(&k2, 0, sizeof(k2)); + memset(out, 0, sizeof(out)); + return r; + } @@ -1440,6 +1442,7 @@ SC_FUNC_CALLED(card->ctx, 1); |