Constification.

diff --git a/apps/apps.h b/apps/apps.h
index 3f15f1034a116a799c9653c1ebe48da7caede5fc..0ed516232d54714742ffe8febfe1653e68970e11 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -265,9 +265,10 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug);
 
 #ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
 
 #ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,

-                       char *host, char *path, char *port, int use_ssl,
-                       STACK_OF(CONF_VALUE) *headers,
-                       int req_timeout);
+                                const char *host, const char *path,
+                                const char *port, int use_ssl,
+                                const STACK_OF(CONF_VALUE) *headers,
+                                int req_timeout);

 #endif
 
 int load_config(BIO *err, CONF *cnf);
 #endif
 
 int load_config(BIO *err, CONF *cnf);

diff --git a/apps/ocsp.c b/apps/ocsp.c
index e2906222df4a33517d84a71d5049cff5f8eb14f9..ccf2f0f9497ae56e193240da4b5b0d3fc90d2d63 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -110,12 +110,12 @@ static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db
                        int nmin, int ndays, int badsig);
 
 static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);
                        int nmin, int ndays, int badsig);
 
 static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);

-static BIO *init_responder(char *port);
-static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port);
+static BIO *init_responder(const char *port);
+static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, const char *port);

 static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);
 static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);

-static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
-                               STACK_OF(CONF_VALUE) *headers,
-                               OCSP_REQUEST *req, int req_timeout);
+static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, const char *path,
+                                     const STACK_OF(CONF_VALUE) *headers,
+                                     OCSP_REQUEST *req, int req_timeout);

 
 #undef PROG
 #define PROG ocsp_main
 
 #undef PROG
 #define PROG ocsp_main


@@ -1223,7 +1223,7 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
 
 /* Quick and dirty OCSP server: read in and parse input request */
 
 
 /* Quick and dirty OCSP server: read in and parse input request */
 

-static BIO *init_responder(char *port)
+static BIO *init_responder(const char *port)

        {
        BIO *acbio = NULL, *bufbio = NULL;
        bufbio = BIO_new(BIO_f_buffer());
        {
        BIO *acbio = NULL, *bufbio = NULL;
        bufbio = BIO_new(BIO_f_buffer());


@@ -1254,7 +1254,8 @@ static BIO *init_responder(char *port)
        return NULL;
        }
 
        return NULL;
        }
 

-static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port)
+static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
+                       const char *port)

        {
        int have_post = 0, len;
        OCSP_REQUEST *req = NULL;
        {
        int have_post = 0, len;
        OCSP_REQUEST *req = NULL;


@@ -1320,9 +1321,9 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
        return 1;
        }
 
        return 1;
        }
 

-static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
-                               STACK_OF(CONF_VALUE) *headers,
-                               OCSP_REQUEST *req, int req_timeout)
+static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, const char *path,
+                                     const STACK_OF(CONF_VALUE) *headers,
+                                     OCSP_REQUEST *req, int req_timeout)

        {
        int fd;
        int rv;
        {
        int fd;
        int rv;


@@ -1418,9 +1419,10 @@ static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
        }
 
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
        }
 
 OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,

-                       char *host, char *path, char *port, int use_ssl,
-                       STACK_OF(CONF_VALUE) *headers,
-                       int req_timeout)
+                                const char *host, const char *path,
+                                const char *port, int use_ssl,
+                                const STACK_OF(CONF_VALUE) *headers,
+                                int req_timeout)

        {
        BIO *cbio = NULL;
        SSL_CTX *ctx = NULL;
        {
        BIO *cbio = NULL;
        SSL_CTX *ctx = NULL;

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index d32bf7f7a2a98b9fdfb0d0f7e659d82ec1135b43..c14009ad0d3524109fb808411455a0bd6356c38c 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -739,8 +739,8 @@ int BIO_dgram_sctp_wait_for_dry(BIO *b);
 int BIO_dgram_sctp_msg_waiting(BIO *b);
 #endif
 BIO *BIO_new_fd(int fd, int close_flag);
 int BIO_dgram_sctp_msg_waiting(BIO *b);
 #endif
 BIO *BIO_new_fd(int fd, int close_flag);

-BIO *BIO_new_connect(char *host_port);
-BIO *BIO_new_accept(char *host_port);
+BIO *BIO_new_connect(const char *host_port);
+BIO *BIO_new_accept(const char *host_port);

 
 int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
        BIO **bio2, size_t writebuf2);
 
 int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
        BIO **bio2, size_t writebuf2);

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 5d49e1a72bcc950dcbf14b7b302f78e826c35d84..4110ff1a45ec9e3940ace6fdf3c682b699332b59 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -460,7 +460,7 @@ static int acpt_puts(BIO *bp, const char *str)
        return(ret);
        }
 
        return(ret);
        }
 

-BIO *BIO_new_accept(char *str)
+BIO *BIO_new_accept(const char *str)

        {
        BIO *ret;
 
        {
        BIO *ret;
 

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index c14727855b259b30b1ed679948337ba2f2e95a1f..91e47e92eb45baf1b93827871dccfc5a388803a3 100644 (file)
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -633,7 +633,7 @@ static int conn_puts(BIO *bp, const char *str)
        return(ret);
        }
 
        return(ret);
        }
 

-BIO *BIO_new_connect(char *str)
+BIO *BIO_new_connect(const char *str)

        {
        BIO *ret;
 
        {
        BIO *ret;
 

diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h
index 7bf3404b501749458cb40e17abcc38b9babc801b..b2acebec302b035a60444c6f6ff7c65874df55ba 100644 (file)
--- a/crypto/ocsp/ocsp.h
+++ b/crypto/ocsp/ocsp.h
@@ -401,8 +401,8 @@ typedef struct ocsp_service_locator_st
 
 OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
 
 
 OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
 

-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req);
-OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
+OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req);
+OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req,

                                                                int maxline);
 int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx);
 int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
                                                                int maxline);
 int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx);
 int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);

diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index de34a91c5398867e8c1e26547b7d2de1774be1db..a05304748a3d1dd26d796ae19e81ee62a83cd66f 100644 (file)
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -233,8 +233,8 @@ int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx,
        return 1;
        }
 
        return 1;
        }
 

-OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
-                                                               int maxline)
+OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path, OCSP_REQUEST *req,
+                              int maxline)

        {
 
        OCSP_REQ_CTX *rctx = NULL;
        {
 
        OCSP_REQ_CTX *rctx = NULL;


@@ -563,7 +563,7 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
 
 /* Blocking OCSP request handler: now a special case of non-blocking I/O */
 
 
 /* Blocking OCSP request handler: now a special case of non-blocking I/O */
 

-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
+OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req)

        {
        OCSP_RESPONSE *resp = NULL;
        OCSP_REQ_CTX *ctx;
        {
        OCSP_RESPONSE *resp = NULL;
        OCSP_REQ_CTX *ctx;