projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some 'const's for BNs.
[openssl.git]
/
crypto
/
bn
/
bn_word.c
diff --git
a/crypto/bn/bn_word.c
b/crypto/bn/bn_word.c
index 4b3d0f011d20e44fa7872421f6422369f1abece3..73157a7d43fda6711572abe34dd28a11b0855a42 100644
(file)
--- a/
crypto/bn/bn_word.c
+++ b/
crypto/bn/bn_word.c
@@
-60,9
+60,7
@@
#include "cryptlib.h"
#include "bn_lcl.h"
#include "cryptlib.h"
#include "bn_lcl.h"
-BN_ULONG BN_mod_word(a, w)
-BIGNUM *a;
-unsigned long w;
+BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w)
{
#ifndef BN_LLONG
BN_ULONG ret=0;
{
#ifndef BN_LLONG
BN_ULONG ret=0;
@@
-75,8
+73,8
@@
unsigned long w;
for (i=a->top-1; i>=0; i--)
{
#ifndef BN_LLONG
for (i=a->top-1; i>=0; i--)
{
#ifndef BN_LLONG
- ret=((ret<<BN_BITS4)|((a->d[i]>>BN_BITS4)&BN_MASK2l))%
(unsigned long)
w;
- ret=((ret<<BN_BITS4)|(a->d[i]&BN_MASK2l))%
(unsigned long)
w;
+ ret=((ret<<BN_BITS4)|((a->d[i]>>BN_BITS4)&BN_MASK2l))%w;
+ ret=((ret<<BN_BITS4)|(a->d[i]&BN_MASK2l))%w;
#else
ret=(BN_ULLONG)(((ret<<(BN_ULLONG)BN_BITS2)|a->d[i])%
(BN_ULLONG)w);
#else
ret=(BN_ULLONG)(((ret<<(BN_ULLONG)BN_BITS2)|a->d[i])%
(BN_ULLONG)w);
@@
-85,9
+83,7
@@
unsigned long w;
return((BN_ULONG)ret);
}
return((BN_ULONG)ret);
}
-BN_ULONG BN_div_word(a, w)
-BIGNUM *a;
-unsigned long w;
+BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w)
{
BN_ULONG ret;
int i;
{
BN_ULONG ret;
int i;
@@
-100,18
+96,16
@@
unsigned long w;
BN_ULONG l,d;
l=a->d[i];
BN_ULONG l,d;
l=a->d[i];
- d=bn_div
64
(ret,l,w);
+ d=bn_div
_words
(ret,l,w);
ret=(l-((d*w)&BN_MASK2))&BN_MASK2;
a->d[i]=d;
}
ret=(l-((d*w)&BN_MASK2))&BN_MASK2;
a->d[i]=d;
}
- if (
a->d[a->top-1] == 0
)
+ if (
(a->top > 0) && (a->d[a->top-1] == 0)
)
a->top--;
return(ret);
}
a->top--;
return(ret);
}
-int BN_add_word(a, w)
-BIGNUM *a;
-unsigned long w;
+int BN_add_word(BIGNUM *a, BN_ULONG w)
{
BN_ULONG l;
int i;
{
BN_ULONG l;
int i;
@@
-142,9
+136,7
@@
unsigned long w;
return(1);
}
return(1);
}
-int BN_sub_word(a, w)
-BIGNUM *a;
-unsigned long w;
+int BN_sub_word(BIGNUM *a, BN_ULONG w)
{
int i;
{
int i;
@@
-183,9
+175,7
@@
unsigned long w;
return(1);
}
return(1);
}
-int BN_mul_word(a,w)
-BIGNUM *a;
-unsigned long w;
+int BN_mul_word(BIGNUM *a, BN_ULONG w)
{
BN_ULONG ll;
{
BN_ULONG ll;
@@
-199,6
+189,6
@@
unsigned long w;
a->d[a->top++]=ll;
}
}
a->d[a->top++]=ll;
}
}
- return(
0
);
+ return(
1
);
}
}