This is a potpourri of functions that still need conversion. I either
missed them in eaerlier batches or they didn't fit nicely with anything
else. It's the last piece of the big diff that sthen ran through his
bulk build.
Note that this diff needs my previous submission
"const for s2i_* and i2s_ conversion functions"
to compile.
Index: lib/libcrypto/asn1/a_strex.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/asn1/a_strex.c,v
retrieving revision 1.27
diff -u -p -r1.27 a_strex.c
--- lib/libcrypto/asn1/a_strex.c 18 May 2018 18:23:24 -0000 1.27
+++ lib/libcrypto/asn1/a_strex.c 19 May 2018 04:02:36 -0000
@@ -624,7 +624,7 @@ ASN1_STRING_print_ex_fp(FILE *fp, const
*/
int
-ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in)
+ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in)
{
ASN1_STRING stmp, *str = &stmp;
int mbflag, type, ret;
Index: lib/libcrypto/asn1/asn1.h
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/asn1/asn1.h,v
retrieving revision 1.48
diff -u -p -r1.48 asn1.h
--- lib/libcrypto/asn1/asn1.h 1 May 2018 13:29:09 -0000 1.48
+++ lib/libcrypto/asn1/asn1.h 19 May 2018 04:02:36 -0000
@@ -1055,7 +1055,7 @@ int ASN1_item_i2d_fp(const ASN1_ITEM *it
int ASN1_STRING_print_ex_fp(FILE *fp, const ASN1_STRING *str,
unsigned long flags);
-int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
+int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in);
#ifndef OPENSSL_NO_BIO
void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
Index: lib/libcrypto/ui/ui.h
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/ui/ui.h,v
retrieving revision 1.9
diff -u -p -r1.9 ui.h
--- lib/libcrypto/ui/ui.h 10 Jul 2014 22:45:58 -0000 1.9
+++ lib/libcrypto/ui/ui.h 19 May 2018 04:02:36 -0000
@@ -304,7 +304,7 @@ enum UI_string_types {
};
/* Create and manipulate methods */
-UI_METHOD *UI_create_method(char *name);
+UI_METHOD *UI_create_method(const char *name);
void UI_destroy_method(UI_METHOD *ui_method);
int UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui));
int UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING
*uis));
Index: lib/libcrypto/ui/ui_lib.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/ui/ui_lib.c,v
retrieving revision 1.32
diff -u -p -r1.32 ui_lib.c
--- lib/libcrypto/ui/ui_lib.c 29 Jan 2017 17:49:23 -0000 1.32
+++ lib/libcrypto/ui/ui_lib.c 19 May 2018 04:02:36 -0000
@@ -582,7 +582,7 @@ UI_set_method(UI *ui, const UI_METHOD *m
UI_METHOD *
-UI_create_method(char *name)
+UI_create_method(const char *name)
{
UI_METHOD *ui_method = calloc(1, sizeof(UI_METHOD));
Index: lib/libcrypto/x509/x509.h
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509/x509.h,v
retrieving revision 1.65
diff -u -p -r1.65 x509.h
--- lib/libcrypto/x509/x509.h 18 May 2018 19:28:27 -0000 1.65
+++ lib/libcrypto/x509/x509.h 19 May 2018 04:02:36 -0000
@@ -1107,8 +1107,8 @@ X509_NAME_ENTRY *X509_NAME_get_entry(con
X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne,
int loc, int set);
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
- const unsigned char *bytes, int len, int loc, int set);
+int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj,
+ int type, const unsigned char *bytes, int len, int loc, int set);
int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
const unsigned char *bytes, int len, int loc, int set);
X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
@@ -1186,7 +1186,7 @@ int X509_REVOKED_add1_ext_i2d(X509_REVO
X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
int nid, int crit, ASN1_OCTET_STRING *data);
X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
- ASN1_OBJECT *obj,int crit,ASN1_OCTET_STRING *data);
+ const ASN1_OBJECT *obj, int crit, ASN1_OCTET_STRING *data);
int X509_EXTENSION_set_object(X509_EXTENSION *ex,
const ASN1_OBJECT *obj);
int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
Index: lib/libcrypto/x509/x509_v3.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509/x509_v3.c,v
retrieving revision 1.16
diff -u -p -r1.16 x509_v3.c
--- lib/libcrypto/x509/x509_v3.c 18 May 2018 16:55:58 -0000 1.16
+++ lib/libcrypto/x509/x509_v3.c 19 May 2018 04:02:36 -0000
@@ -209,8 +209,8 @@ X509_EXTENSION_create_by_NID(X509_EXTENS
}
X509_EXTENSION *
-X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, ASN1_OBJECT *obj, int crit,
- ASN1_OCTET_STRING *data)
+X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex, const ASN1_OBJECT *obj,
+ int crit, ASN1_OCTET_STRING *data)
{
X509_EXTENSION *ret;
Index: lib/libcrypto/x509/x509name.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509/x509name.c,v
retrieving revision 1.24
diff -u -p -r1.24 x509name.c
--- lib/libcrypto/x509/x509name.c 18 May 2018 18:16:39 -0000 1.24
+++ lib/libcrypto/x509/x509name.c 19 May 2018 04:02:36 -0000
@@ -188,7 +188,7 @@ X509_NAME_delete_entry(X509_NAME *name,
}
int
-X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
+X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
const unsigned char *bytes, int len, int loc, int set)
{
X509_NAME_ENTRY *ne;
Index: lib/libcrypto/x509v3/v3_lib.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509v3/v3_lib.c,v
retrieving revision 1.17
diff -u -p -r1.17 v3_lib.c
--- lib/libcrypto/x509v3/v3_lib.c 29 Jan 2017 17:49:23 -0000 1.17
+++ lib/libcrypto/x509v3/v3_lib.c 19 May 2018 04:02:36 -0000
@@ -227,7 +227,7 @@ X509V3_EXT_d2i(X509_EXTENSION *ext)
*/
void *
-X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
+X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
{
int lastpos, i;
X509_EXTENSION *ex, *found_ex = NULL;
Index: lib/libcrypto/x509v3/v3_prn.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509v3/v3_prn.c,v
retrieving revision 1.19
diff -u -p -r1.19 v3_prn.c
--- lib/libcrypto/x509v3/v3_prn.c 30 Dec 2016 15:54:49 -0000 1.19
+++ lib/libcrypto/x509v3/v3_prn.c 19 May 2018 04:02:36 -0000
@@ -152,8 +152,8 @@ err:
}
int
-X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts,
- unsigned long flag, int indent)
+X509V3_extensions_print(BIO *bp, const char *title,
+ const STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent)
{
int i, j;
Index: lib/libcrypto/x509v3/v3_utl.c
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509v3/v3_utl.c,v
retrieving revision 1.29
diff -u -p -r1.29 v3_utl.c
--- lib/libcrypto/x509v3/v3_utl.c 18 May 2018 19:34:37 -0000 1.29
+++ lib/libcrypto/x509v3/v3_utl.c 19 May 2018 04:02:36 -0000
@@ -230,7 +230,7 @@ s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth
}
int
-X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
+X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
STACK_OF(CONF_VALUE) **extlist)
{
char *strtmp;
Index: lib/libcrypto/x509v3/x509v3.h
===================================================================
RCS file: /var/cvs/src/lib/libcrypto/x509v3/x509v3.h,v
retrieving revision 1.27
diff -u -p -r1.27 x509v3.h
--- lib/libcrypto/x509v3/x509v3.h 18 May 2018 19:34:37 -0000 1.27
+++ lib/libcrypto/x509v3/x509v3.h 19 May 2018 04:02:36 -0000
@@ -742,7 +742,7 @@ int X509V3_add_value_uchar(const char *n
STACK_OF(CONF_VALUE) **extlist);
int X509V3_add_value_bool(const char *name, int asn1_bool,
STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
+int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
STACK_OF(CONF_VALUE) **extlist);
char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
ASN1_INTEGER * s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, const char *value);
@@ -758,7 +758,8 @@ const X509V3_EXT_METHOD *X509V3_EXT_get_
int X509V3_add_standard_extensions(void);
STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int
*idx);
+void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
+ int *idx);
X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
@@ -773,7 +774,8 @@ void X509V3_EXT_val_prn(BIO *out, STACK_
int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int
indent);
int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-int X509V3_extensions_print(BIO *out, char *title, STACK_OF(X509_EXTENSION)
*exts, unsigned long flag, int indent);
+int X509V3_extensions_print(BIO *out, const char *title,
+ const STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent);
int X509_check_ca(X509 *x);
int X509_check_purpose(X509 *x, int id, int ca);
