--- old/src/share/native/sun/security/ec/impl/ec.c	2014-05-27 12:59:27.753806000 -0700
+++ new/src/share/native/sun/security/ec/impl/ec.c	2014-05-27 12:59:27.575804000 -0700
@@ -55,16 +55,6 @@
 #include "mpi.h"
 #include "ecc_impl.h"
 
-#ifdef _KERNEL
-#define PORT_ZFree(p, l)                bzero((p), (l)); kmem_free((p), (l))
-#else
-#ifndef _WIN32
-#define PORT_ZFree(p, l)                bzero((p), (l)); free((p))
-#else
-#define PORT_ZFree(p, l)                memset((p), 0, (l)); free((p))
-#endif /* _WIN32 */
-#endif
-
 /*
  * Returns true if pointP is the point at infinity, false otherwise
  */
@@ -422,11 +412,7 @@
         rv = SECFailure;
     }
     if (rv != SECSuccess && privKeyBytes) {
-#ifdef _KERNEL
-        kmem_free(privKeyBytes, 2*len);
-#else
-        free(privKeyBytes);
-#endif
+        PORT_ZFree(privKeyBytes, 2*len);
         privKeyBytes = NULL;
     }
     return privKeyBytes;