Commit 70f34a58 authored by Nils Larsch's avatar Nils Larsch
Browse files

some const fixes and cleanup

parent c2e40d0f

crypto/asn1/asn1_par.c

+5 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse 
				{

				if (BIO_write(bp,":",1) <= 0) goto end;

				if ((len > 0) &&

					BIO_write(bp,(char *)p,(int)len)

					BIO_write(bp,(const char *)p,(int)len)

					!= (int)len)

					goto end;

				}
@@ -278,7 +278,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse 
						{

						if (BIO_write(bp,":",1) <= 0)

							goto end;

						if (BIO_write(bp,(char *)opp,

						if (BIO_write(bp,(const char *)opp,

							os->length) <= 0)

							goto end;

						}
@@ -303,7 +303,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse 
							if (BIO_write(bp,"\n",1) <= 0)

								goto end;

							}

						if (BIO_dump_indent(bp,(char *)opp,

						if (BIO_dump_indent(bp,

							(const char *)opp,

							((dump == -1 || dump > 

							os->length)?os->length:dump),

							dump_indent) <= 0)
@@ -388,7 +389,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offse 
					if (BIO_write(bp,"\n",1) <= 0)

						goto end;

					}

				if (BIO_dump_indent(bp,(char *)p,

				if (BIO_dump_indent(bp,(const char *)p,

					((dump == -1 || dump > len)?len:dump),

					dump_indent) <= 0)

					goto end;

crypto/bio/b_print.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ fmtint( 
    int flags)

{

    int signvalue = 0;

    char *prefix = "";

    const char *prefix = "";

    unsigned LLONG uvalue;

    char convert[DECIMAL_SIZE(value)+3];

    int place = 0;

crypto/err/err.c

+7 −7
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static unsigned long err_hash(const void *a_void) 
	{

	unsigned long ret,l;



	l=((ERR_STRING_DATA *)a_void)->error;

	l=((const ERR_STRING_DATA *)a_void)->error;

	ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);

	return(ret^ret%19*13);

	}
@@ -951,21 +951,21 @@ static unsigned long err_hash(const void *a_void) 
/* static int err_cmp(ERR_STRING_DATA *a, ERR_STRING_DATA *b) */

static int err_cmp(const void *a_void, const void *b_void)

	{

	return((int)(((ERR_STRING_DATA *)a_void)->error -

			((ERR_STRING_DATA *)b_void)->error));

	return((int)(((const ERR_STRING_DATA *)a_void)->error -

			((const ERR_STRING_DATA *)b_void)->error));

	}



/* static unsigned long pid_hash(ERR_STATE *a) */

static unsigned long pid_hash(const void *a_void)

	{

	return(((ERR_STATE *)a_void)->pid*13);

	return(((const ERR_STATE *)a_void)->pid*13);

	}



/* static int pid_cmp(ERR_STATE *a, ERR_STATE *b) */

static int pid_cmp(const void *a_void, const void *b_void)

	{

	return((int)((long)((ERR_STATE *)a_void)->pid -

			(long)((ERR_STATE *)b_void)->pid));

	return((int)((long)((const ERR_STATE *)a_void)->pid -

			(long)((const ERR_STATE *)b_void)->pid));

	}



void ERR_remove_state(unsigned long pid)
@@ -1075,7 +1075,7 @@ void ERR_add_error_data(int num, ...) 
				else

					str=p;

				}

			BUF_strlcat(str,a,s+1);

			BUF_strlcat(str,a,(size_t)s+1);

			}

		}

	ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);

crypto/evp/evp_pbe.c

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen, 


static int pbe_cmp(const char * const *a, const char * const *b)

{

	EVP_PBE_CTL **pbe1 = (EVP_PBE_CTL **) a,  **pbe2 = (EVP_PBE_CTL **)b;

	const EVP_PBE_CTL * const *pbe1 = (const EVP_PBE_CTL * const *) a,

			* const *pbe2 = (const EVP_PBE_CTL * const *)b;

	return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);

}

crypto/evp/evp_pkey.c

+0 −2
Original line number Diff line number Diff line
@@ -414,8 +414,6 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken) 
		default:

		EVPerr(EVP_F_EVP_PKCS8_SET_BROKEN,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);

		return NULL;

		break;

		

	}

}