Remove casts by using correct macros

Motivation: We can use the correct macros and so remove manual casts. Modifications: Use correct macros. Result: Cleaner code.
davidben · Aug 5, 2016 · 94d4c41 · 94d4c41
1 parent 766b47f
commit 94d4c41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/openssl-dynamic/src/main/c/ssl.c b/openssl-dynamic/src/main/c/ssl.c
@@ -1670,7 +1670,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, getPeerCertChain)(TCN_STDARGS,
     // Get a stack of all certs in the chain.
     sk = SSL_get_peer_cert_chain(ssl_);
 
-    len = sk_num((_STACK*) sk);
+    len = sk_X509_num(sk);
     if (len <= 0) {
         // No peer certificate chain as no auth took place yet, or the auth was not successful.
         return NULL;
@@ -1679,7 +1679,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, getPeerCertChain)(TCN_STDARGS,
     array = (*e)->NewObjectArray(e, len, byteArrayClass, NULL);
 
     for(i = 0; i < len; i++) {
-        cert = (X509*) sk_value((_STACK*) sk, i);
+        cert = sk_X509_value(sk, i);
 
         buf = NULL;
         length = i2d_X509(cert, &buf);
@@ -1932,7 +1932,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, getCiphers)(TCN_STDARGS, jlong ssl)
     UNREFERENCED_STDARGS;
 
     sk = SSL_get_ciphers(ssl_);
-    len = sk_num((_STACK*) sk);
+    len = sk_SSL_CIPHER_num(sk);
 
     if (len <= 0) {
         // No peer certificate chain as no auth took place yet, or the auth was not successful.
@@ -1943,7 +1943,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, getCiphers)(TCN_STDARGS, jlong ssl)
     array = (*e)->NewObjectArray(e, len, stringClass, NULL);
 
     for (i = 0; i < len; i++) {
-        cipher = (SSL_CIPHER*) sk_value((_STACK*) sk, i);
+        cipher = sk_SSL_CIPHER_value(sk, i);
         name = SSL_CIPHER_get_name(cipher);
 
         c_name = (*e)->NewStringUTF(e, name);
@@ -2098,7 +2098,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSL, authenticationMethods)(TCN_STDARGS, jlong
     UNREFERENCED(o);
 
     ciphers = SSL_get_ciphers(ssl_);
-    len = sk_num((_STACK*) ciphers);
+    len = sk_SSL_CIPHER_num(ciphers);
 
     array = (*e)->NewObjectArray(e, len, stringClass, NULL);
 

diff --git a/openssl-dynamic/src/main/c/sslcontext.c b/openssl-dynamic/src/main/c/sslcontext.c
@@ -1470,11 +1470,11 @@ static const char* authentication_method(const SSL* ssl) {
             return SSL_TXT_RSA;
         default:
             ciphers = SSL_get_ciphers(ssl);
-            if (ciphers == NULL || sk_num((_STACK*) ciphers) <= 0) {
+            if (ciphers == NULL || sk_SSL_CIPHER_num(ciphers) <= 0) {
                 // No cipher available so return UNKNOWN.
                 return UNKNOWN_AUTH_METHOD;
             }
-            return SSL_cipher_authentication_method(sk_value((_STACK*) ciphers, 0));
+            return SSL_cipher_authentication_method(sk_SSL_CIPHER_value(ciphers, 0));
         }
     }
 }
@@ -1489,7 +1489,7 @@ static int SSL_cert_verify(X509_STORE_CTX *ctx, void *arg) {
     // Get a stack of all certs in the chain
     STACK_OF(X509) *sk = ctx->untrusted;
 
-    int len = sk_num((_STACK*) sk);
+    int len = sk_X509_num(sk);
     unsigned i;
     X509 *cert;
     int length;
@@ -1506,7 +1506,7 @@ static int SSL_cert_verify(X509_STORE_CTX *ctx, void *arg) {
     array = (*e)->NewObjectArray(e, len, byteArrayClass, NULL);
 
     for(i = 0; i < len; i++) {
-        cert = (X509*) sk_value((_STACK*) sk, i);
+        cert = sk_X509_value(sk, i);
 
         buf = NULL;
         length = i2d_X509(cert, &buf);