diff options
| author | simon <simon@FreeBSD.org> | 2007-03-15 20:07:27 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2007-03-15 20:07:27 +0000 |
| commit | 394ba190a3f3c2ec13e67e830b6faeb2dd3e651c (patch) | |
| tree | d788253de8c917bbf6257b56dbda264342f8095e /crypto/openssl/crypto/idea | |
| parent | 699a8581f98495705b6c4fa8f75d5b9e815d63aa (diff) | |
| download | FreeBSD-src-394ba190a3f3c2ec13e67e830b6faeb2dd3e651c.zip FreeBSD-src-394ba190a3f3c2ec13e67e830b6faeb2dd3e651c.tar.gz | |
Resolve conflicts after import of OpenSSL 0.9.8e.
Diffstat (limited to 'crypto/openssl/crypto/idea')
| -rw-r--r-- | crypto/openssl/crypto/idea/i_ecb.c | 2 | ||||
| -rw-r--r-- | crypto/openssl/crypto/idea/idea_lcl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/crypto/idea/i_ecb.c b/crypto/openssl/crypto/idea/i_ecb.c index fb613db..fef3823 100644 --- a/crypto/openssl/crypto/idea/i_ecb.c +++ b/crypto/openssl/crypto/idea/i_ecb.c @@ -60,7 +60,7 @@ #include "idea_lcl.h" #include <openssl/opensslv.h> -const char *IDEA_version="IDEA" OPENSSL_VERSION_PTEXT; +const char IDEA_version[]="IDEA" OPENSSL_VERSION_PTEXT; const char *idea_options(void) { diff --git a/crypto/openssl/crypto/idea/idea_lcl.h b/crypto/openssl/crypto/idea/idea_lcl.h index 463aa36..f3dbfa6 100644 --- a/crypto/openssl/crypto/idea/idea_lcl.h +++ b/crypto/openssl/crypto/idea/idea_lcl.h @@ -67,7 +67,7 @@ if (ul != 0) \ r-=((r)>>16); \ } \ else \ - r=(-(int)a-b+1); /* assuming a or b is 0 and in range */ \ + r=(-(int)a-b+1); /* assuming a or b is 0 and in range */ #ifdef undef #define idea_mul(r,a,b,ul,sl) \ |
