Merge pull request #99 from cconlon/castingCleanup

Casting cleanup, Java side

Author: JacobBarthelmeh

native/com_wolfssl_WolfSSLSession.c

@@ -3637,7 +3637,7 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSLSession_gotCloseNotify
     WOLFSSL* ssl = (WOLFSSL*)(uintptr_t)sslPtr;
     (void)jcl;
 
-    if (jenv == NULL || ssl <= 0) {
+    if (jenv == NULL || ssl == NULL) {
         return gotCloseNotify;
     }
 

src/java/com/wolfssl/WolfSSLCertificate.java

@@ -93,7 +93,7 @@ public WolfSSLCertificate(byte[] der) throws WolfSSLException {
         }
 
         x509Ptr = X509_load_certificate_buffer(der, WolfSSL.SSL_FILETYPE_ASN1);
-        if (x509Ptr <= 0) {
+        if (x509Ptr == 0) {
             throw new WolfSSLException("Failed to create WolfSSLCertificate");
         }
 
@@ -126,7 +126,7 @@ public WolfSSLCertificate(byte[] in, int format) throws WolfSSLException {
         }
 
         x509Ptr = X509_load_certificate_buffer(in, format);
-        if (x509Ptr <= 0) {
+        if (x509Ptr == 0) {
             throw new WolfSSLException("Failed to create WolfSSLCertificate");
         }
 
@@ -149,7 +149,7 @@ public WolfSSLCertificate(String fileName) throws WolfSSLException {
 
         x509Ptr = X509_load_certificate_file(fileName,
                                              WolfSSL.SSL_FILETYPE_ASN1);
-        if (x509Ptr <= 0) {
+        if (x509Ptr == 0) {
             throw new WolfSSLException("Failed to create WolfSSLCertificate");
         }
 
@@ -183,7 +183,7 @@ public WolfSSLCertificate(String fileName, int format)
         }
 
         x509Ptr = X509_load_certificate_file(fileName, format);
-        if (x509Ptr <= 0) {
+        if (x509Ptr == 0) {
             throw new WolfSSLException("Failed to create WolfSSLCertificate");
         }
 
@@ -199,8 +199,8 @@ public WolfSSLCertificate(String fileName, int format)
      */
     public WolfSSLCertificate(long x509) throws WolfSSLException {
 
-        if (x509 <= 0) {
-            throw new WolfSSLException("Input pointer may not be <= 0");
+        if (x509 == 0) {
+            throw new WolfSSLException("Input pointer may not be 0/NULL");
         }
         x509Ptr = x509;
         this.active = true;