Upgrade chrome's OpenSSL to same version Android ships with.

openssl/engines/e_4758cca.c

 /* Author: Maurice Gittens <maurice@gittens.nl>                       */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
@@ skipping 74 matching lines @@
 /* rsa functions */
 /*---------------*/
 #ifndef OPENSSL_NO_RSA
 static int cca_rsa_pub_enc(int flen, const unsigned char *from,
                 unsigned char *to, RSA *rsa,int padding);
 static int cca_rsa_priv_dec(int flen, const unsigned char *from,
                 unsigned char *to, RSA *rsa,int padding);
 static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
                 unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
 static int cca_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len,
-                unsigned char *sigbuf, unsigned int siglen, const RSA *rsa);
+        const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa);
 
 /* utility functions */
 /*-----------------------*/
 static EVP_PKEY *ibm_4758_load_privkey(ENGINE*, const char*,
                 UI_METHOD *ui_method, void *callback_data);
 static EVP_PKEY *ibm_4758_load_pubkey(ENGINE*, const char*,
                 UI_METHOD *ui_method, void *callback_data);
 
 static int getModulusAndExponent(const unsigned char *token, long *exponentLength,
                 unsigned char *exponent, long *modulusLength,
                 long *modulusFieldLength, unsigned char *modulus);
 #endif
 
 /* RAND number functions */
 /*-----------------------*/
-static int cca_get_random_bytes(unsigned char*, int );
+static int cca_get_random_bytes(unsigned char*, int);
 static int cca_random_status(void);
 
 #ifndef OPENSSL_NO_RSA
 static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
                 int idx,long argl, void *argp);
 #endif
 
 /* Function pointers for CCA verbs */
 /*---------------------------------*/
 #ifndef OPENSSL_NO_RSA
@@ skipping 353 matching lines @@
         rtmp->n = BN_bin2bn(modulus, modulusFieldLength, NULL);
         rtmp->flags |= RSA_FLAG_EXT_PKEY;
 
         res = EVP_PKEY_new();
         EVP_PKEY_assign_RSA(res, rtmp);
 
         return res;
 err:
         if (keyToken)
                 OPENSSL_free(keyToken);
-        if (res)
-                EVP_PKEY_free(res);
-        if (rtmp)
-                RSA_free(rtmp);
         return NULL;
         }
 
 static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
                         UI_METHOD *ui_method, void *callback_data)
         {
         RSA *rtmp = NULL;
         EVP_PKEY *res = NULL;
         unsigned char* keyToken = NULL;
         long keyTokenLength = MAX_CCA_PKA_TOKEN_SIZE;
@@ skipping 54 matching lines @@
         rtmp->e = BN_bin2bn(exponent, exponentLength, NULL);
         rtmp->n = BN_bin2bn(modulus, modulusFieldLength, NULL);
         rtmp->flags |= RSA_FLAG_EXT_PKEY;
         res = EVP_PKEY_new();
         EVP_PKEY_assign_RSA(res, rtmp);
 
         return res;
 err:
         if (keyToken)
                 OPENSSL_free(keyToken);
-        if (res)
-                EVP_PKEY_free(res);
-        if (rtmp)
-                RSA_free(rtmp);
         return NULL;
         }
 
 static int cca_rsa_pub_enc(int flen, const unsigned char *from,
                         unsigned char *to, RSA *rsa,int padding)
         {
         long returnCode;
         long reasonCode;
         long lflen = flen;
         long exitDataLength = 0;
@@ skipping 42 matching lines @@
                 &ruleArrayLength, ruleArray, &lflen, (unsigned char*)from,
                 &dataStructureLength, dataStructure, &keyTokenLength,
                 keyToken, &outputLength, to);
 
         return (returnCode | reasonCode) ? 0 : 1;
         }
 
 #define SSL_SIG_LEN 36
 
 static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
-                unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)
+        const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa)
         {
         long returnCode;
         long reasonCode;
         long lsiglen = siglen;
         long exitDataLength = 0;
         unsigned char exitData[8];
         long ruleArrayLength = 1;
         unsigned char ruleArray[8] = "PKCS-1.1";
         long keyTokenLength;
         unsigned char* keyToken = (unsigned char*)RSA_get_ex_data(rsa, hndidx);
@@ skipping 88 matching lines @@
                                 }
                         i2d_X509_SIG(&sig, &ptr);
                         }
                         break;
                 default:
                         return 0;
                 }
 
         digitalSignatureVerify(&returnCode, &reasonCode, &exitDataLength,
                 exitData, &ruleArrayLength, ruleArray, &keyTokenLength,
-                keyToken, &length, hashBuffer, &lsiglen, sigbuf);
+                keyToken, &length, hashBuffer, &lsiglen,
+                                                (unsigned char *)sigbuf);
 
         if (type == NID_sha1 || type == NID_md5)
                 {
                 OPENSSL_cleanse(hashBuffer, keyLength+1);
                 OPENSSL_free(hashBuffer);
                 }
 
         return ((returnCode || reasonCode) ? 0 : 1);
         }
 
@@ skipping 236 matching lines @@
         if(!bind_helper(e))
                 return 0;
         return 1;
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
 #endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_4758_CCA */
 #endif /* !OPENSSL_NO_HW */