Constify d2i, s2i, c2i and r2i functions and other associated

[oweals/openssl.git] / crypto / asn1 / x_x509.c

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index b0d859d38bad0e8a86a797fdb4895162b38e2343..f71ba267d94c7670d1abe2b744c28a1c3f22a090 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -63,9 +63,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-static int x509_meth_num = 0;
-static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL;
-
 ASN1_SEQUENCE(X509_CINF) = {
        ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0),
        ASN1_SIMPLE(X509_CINF, serialNumber, ASN1_INTEGER),
@@ -96,7 +93,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
                ret->skid = NULL;
                ret->akid = NULL;
                ret->aux = NULL;
-               CRYPTO_new_ex_data(x509_meth, ret, &ret->ex_data);
+               CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data);
                break;
 
                case ASN1_OP_D2I_POST:
@@ -105,7 +102,7 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
                break;
 
                case ASN1_OP_FREE_POST:
-               CRYPTO_free_ex_data(x509_meth,ret,&ret->ex_data);
+               CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509, ret, &ret->ex_data);
                X509_CERT_AUX_free(ret->aux);
                ASN1_OCTET_STRING_free(ret->skid);
                AUTHORITY_KEYID_free(ret->akid);
@@ -142,10 +139,8 @@ ASN1_METHOD *X509_asn1_meth(void)
 int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
         {
-       if(CRYPTO_get_ex_new_index(x509_meth_num, &x509_meth, argl, argp,
-                               new_func, dup_func, free_func) < 0)
-               return -1;
-       return (x509_meth_num++);
+       return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, argl, argp,
+                               new_func, dup_func, free_func);
         }
 
 int X509_set_ex_data(X509 *r, int idx, void *arg)
@@ -166,9 +161,9 @@ void *X509_get_ex_data(X509 *r, int idx)
  *
  */
 
-X509 *d2i_X509_AUX(X509 **a, unsigned char **pp, long length)
+X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
 {
-       unsigned char *q;
+       const unsigned char *q;
        X509 *ret;
        /* Save start position */
        q = *pp;