ok
On Sat, May 12, 2018 at 13:14 Theo Buehler <[email protected]> wrote:
> Here's another straightforward batch. As usual, it's been tested in a
> bulk by sthen and there was no fallout.
>
> Index: lib/libcrypto/asn1/ameth_lib.c
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/asn1/ameth_lib.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 ameth_lib.c
> --- lib/libcrypto/asn1/ameth_lib.c 21 Jan 2017 04:31:25 -0000
> 1.16
> +++ lib/libcrypto/asn1/ameth_lib.c 12 May 2018 18:42:51 -0000
> @@ -299,7 +299,7 @@ EVP_PKEY_asn1_get0_info(int *ppkey_id, i
> }
>
> const EVP_PKEY_ASN1_METHOD*
> -EVP_PKEY_get0_asn1(EVP_PKEY *pkey)
> +EVP_PKEY_get0_asn1(const EVP_PKEY *pkey)
> {
> return pkey->ameth;
> }
> Index: lib/libcrypto/evp/evp.h
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/evp/evp.h,v
> retrieving revision 1.59
> diff -u -p -r1.59 evp.h
> --- lib/libcrypto/evp/evp.h 2 May 2018 15:51:41 -0000 1.59
> +++ lib/libcrypto/evp/evp.h 12 May 2018 18:42:51 -0000
> @@ -617,7 +617,8 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
>
> int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
> const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
> -int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t
> siglen);
> +int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
> + size_t siglen);
>
> int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
> const unsigned char *ek, int ekl, const unsigned char *iv, EVP_PKEY
> *priv);
> @@ -866,12 +867,12 @@ int EVP_PKEY_encrypt_old(unsigned char *
> int EVP_PKEY_type(int type);
> int EVP_PKEY_id(const EVP_PKEY *pkey);
> int EVP_PKEY_base_id(const EVP_PKEY *pkey);
> -int EVP_PKEY_bits(EVP_PKEY *pkey);
> +int EVP_PKEY_bits(const EVP_PKEY *pkey);
> int EVP_PKEY_size(EVP_PKEY *pkey);
> int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
> int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
> int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
> -void *EVP_PKEY_get0(EVP_PKEY *pkey);
> +void *EVP_PKEY_get0(const EVP_PKEY *pkey);
>
> #ifndef OPENSSL_NO_RSA
> struct rsa_st;
> @@ -995,7 +996,7 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_i
> const char **pinfo, const char **ppem_str,
> const EVP_PKEY_ASN1_METHOD *ameth);
>
> -const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(EVP_PKEY *pkey);
> +const EVP_PKEY_ASN1_METHOD* EVP_PKEY_get0_asn1(const EVP_PKEY *pkey);
> EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags, const char
> *pem_str,
> const char *info);
> void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
> Index: lib/libcrypto/evp/evp_pkey.c
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/evp/evp_pkey.c,v
> retrieving revision 1.19
> diff -u -p -r1.19 evp_pkey.c
> --- lib/libcrypto/evp/evp_pkey.c 29 Jan 2017 17:49:23 -0000
> 1.19
> +++ lib/libcrypto/evp/evp_pkey.c 12 May 2018 18:42:51 -0000
> @@ -181,7 +181,8 @@ EVP_PKEY_get_attr_by_NID(const EVP_PKEY
> }
>
> int
> -EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj, int
> lastpos)
> +EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
> + int lastpos)
> {
> return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);
> }
> Index: lib/libcrypto/evp/m_sigver.c
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/evp/m_sigver.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 m_sigver.c
> --- lib/libcrypto/evp/m_sigver.c 29 Jan 2017 17:49:23 -0000 1.6
> +++ lib/libcrypto/evp/m_sigver.c 12 May 2018 18:42:51 -0000
> @@ -166,7 +166,7 @@ EVP_DigestSignFinal(EVP_MD_CTX *ctx, uns
> }
>
> int
> -EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
> +EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig, size_t
> siglen)
> {
> EVP_MD_CTX tmp_ctx;
> unsigned char md[EVP_MAX_MD_SIZE];
> Index: lib/libcrypto/evp/p_lib.c
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/evp/p_lib.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 p_lib.c
> --- lib/libcrypto/evp/p_lib.c 14 Apr 2018 07:09:21 -0000 1.21
> +++ lib/libcrypto/evp/p_lib.c 12 May 2018 18:42:51 -0000
> @@ -85,7 +85,7 @@
> static void EVP_PKEY_free_it(EVP_PKEY *x);
>
> int
> -EVP_PKEY_bits(EVP_PKEY *pkey)
> +EVP_PKEY_bits(const EVP_PKEY *pkey)
> {
> if (pkey && pkey->ameth && pkey->ameth->pkey_bits)
> return pkey->ameth->pkey_bits(pkey);
> @@ -277,7 +277,7 @@ EVP_PKEY_assign(EVP_PKEY *pkey, int type
> }
>
> void *
> -EVP_PKEY_get0(EVP_PKEY *pkey)
> +EVP_PKEY_get0(const EVP_PKEY *pkey)
> {
> return pkey->pkey.ptr;
> }
> Index: lib/libcrypto/x509/x509.h
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/x509/x509.h,v
> retrieving revision 1.46
> diff -u -p -r1.46 x509.h
> --- lib/libcrypto/x509/x509.h 1 May 2018 19:01:28 -0000 1.46
> +++ lib/libcrypto/x509/x509.h 12 May 2018 18:42:51 -0000
> @@ -1018,7 +1018,7 @@ int X509_REQ_add_extensions(X509_REQ *re
> int X509_REQ_get_attr_count(const X509_REQ *req);
> int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid,
> int lastpos);
> -int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj,
> +int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
> int lastpos);
> X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
> X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
> @@ -1186,8 +1186,8 @@ int X509_EXTENSION_get_critical(X509_EX
> int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
> int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
> int lastpos);
> -int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
> ASN1_OBJECT *obj,
> - int lastpos);
> +int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
> + const ASN1_OBJECT *obj, int lastpos);
> X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int
> loc);
> X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
> STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
> @@ -1202,7 +1202,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_at
> const char *attrname, int type,
> const unsigned char *bytes, int len);
> void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
> - ASN1_OBJECT *obj, int lastpos, int type);
> + const ASN1_OBJECT *obj, int lastpos, int type);
> X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int
> nid,
> int atrtype, const void *data, int len);
> X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
> @@ -1220,7 +1220,7 @@ ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509
> int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
> int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid,
> int lastpos);
> -int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj,
> +int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
> int lastpos);
> X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
> X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
> Index: lib/libcrypto/x509/x509_att.c
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/x509/x509_att.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 x509_att.c
> --- lib/libcrypto/x509/x509_att.c 29 Jan 2017 17:49:23 -0000
> 1.15
> +++ lib/libcrypto/x509/x509_att.c 12 May 2018 18:42:51 -0000
> @@ -84,8 +84,8 @@ X509at_get_attr_by_NID(const STACK_OF(X5
> }
>
> int
> -X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, ASN1_OBJECT
> *obj,
> - int lastpos)
> +X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
> + const ASN1_OBJECT *obj, int lastpos)
> {
> int n;
> X509_ATTRIBUTE *ex;
> @@ -205,7 +205,7 @@ X509at_add1_attr_by_txt(STACK_OF(X509_AT
> }
>
> void *
> -X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, ASN1_OBJECT *obj,
> +X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, const ASN1_OBJECT
> *obj,
> int lastpos, int type)
> {
> int i;
> Index: lib/libcrypto/x509/x509_req.c
> ===================================================================
> RCS file: /var/cvs/src/lib/libcrypto/x509/x509_req.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 x509_req.c
> --- lib/libcrypto/x509/x509_req.c 29 Jan 2017 17:49:23 -0000
> 1.20
> +++ lib/libcrypto/x509/x509_req.c 12 May 2018 18:42:51 -0000
> @@ -286,7 +286,8 @@ X509_REQ_get_attr_by_NID(const X509_REQ
> }
>
> int
> -X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj, int
> lastpos)
> +X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
> + int lastpos)
> {
> return X509at_get_attr_by_OBJ(req->req_info->attributes, obj,
> lastpos);
> }
>
