projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Harmonise symhacks.h in this branch with lower versions.
[oweals/openssl.git]
/
crypto
/
asn1
/
a_int.c
diff --git
a/crypto/asn1/a_int.c
b/crypto/asn1/a_int.c
index f8d198efb16068b04a3fbd80082c77275b7d4f75..ad0d2506f63203679814cd36018f1dc9c4221b91 100644
(file)
--- a/
crypto/asn1/a_int.c
+++ b/
crypto/asn1/a_int.c
@@
-61,10
+61,10
@@
#include <openssl/asn1.h>
#include <openssl/bn.h>
#include <openssl/asn1.h>
#include <openssl/bn.h>
-ASN1_INTEGER *ASN1_INTEGER_dup(ASN1_INTEGER *x)
+ASN1_INTEGER *ASN1_INTEGER_dup(
const
ASN1_INTEGER *x)
{ return M_ASN1_INTEGER_dup(x);}
{ return M_ASN1_INTEGER_dup(x);}
-int ASN1_INTEGER_cmp(
ASN1_INTEGER *x,
ASN1_INTEGER *y)
+int ASN1_INTEGER_cmp(
const ASN1_INTEGER *x, const
ASN1_INTEGER *y)
{
int neg, ret;
/* Compare signs */
{
int neg, ret;
/* Compare signs */
@@
-273,7
+273,7
@@
ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
{
ASN1_INTEGER *ret=NULL;
const unsigned char *p;
{
ASN1_INTEGER *ret=NULL;
const unsigned char *p;
- unsigned char *
to,*
s;
+ unsigned char *s;
long len;
int inf,tag,xclass;
int i;
long len;
int inf,tag,xclass;
int i;
@@
-308,7
+308,6
@@
ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
i=ERR_R_MALLOC_FAILURE;
goto err;
}
i=ERR_R_MALLOC_FAILURE;
goto err;
}
- to=s;
ret->type=V_ASN1_INTEGER;
if(len) {
if ((*p == 0) && (len != 1))
ret->type=V_ASN1_INTEGER;
if(len) {
if ((*p == 0) && (len != 1))
@@
-373,7
+372,7
@@
int ASN1_INTEGER_set(ASN1_INTEGER *a, long v)
return(1);
}
return(1);
}
-long ASN1_INTEGER_get(ASN1_INTEGER *a)
+long ASN1_INTEGER_get(
const
ASN1_INTEGER *a)
{
int neg=0,i;
long r=0;
{
int neg=0,i;
long r=0;
@@
-387,8
+386,8
@@
long ASN1_INTEGER_get(ASN1_INTEGER *a)
if (a->length > (int)sizeof(long))
{
if (a->length > (int)sizeof(long))
{
- /* hmm... a bit ugly */
- return
(0xffffffffL)
;
+ /* hmm... a bit ugly
, return all ones
*/
+ return
-1
;
}
if (a->data == NULL)
return 0;
}
if (a->data == NULL)
return 0;
@@
-402,7
+401,7
@@
long ASN1_INTEGER_get(ASN1_INTEGER *a)
return(r);
}
return(r);
}
-ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai)
+ASN1_INTEGER *BN_to_ASN1_INTEGER(
const
BIGNUM *bn, ASN1_INTEGER *ai)
{
ASN1_INTEGER *ret;
int len,j;
{
ASN1_INTEGER *ret;
int len,j;
@@
-444,7
+443,7
@@
err:
return(NULL);
}
return(NULL);
}
-BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai, BIGNUM *bn)
+BIGNUM *ASN1_INTEGER_to_BN(
const
ASN1_INTEGER *ai, BIGNUM *bn)
{
BIGNUM *ret;
{
BIGNUM *ret;