diff options
| author | djm <> | 2010-10-01 22:59:01 +0000 |
|---|---|---|
| committer | djm <> | 2010-10-01 22:59:01 +0000 |
| commit | 8922d4bc4a8b8893d72a48deb2cdf58215f98505 (patch) | |
| tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/evp/encode.c | |
| parent | 76262f7bf9262f965142b1b2b2105cb279c5c696 (diff) | |
| download | openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.gz openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.tar.bz2 openbsd-8922d4bc4a8b8893d72a48deb2cdf58215f98505.zip | |
resolve conflicts, fix local changes
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/evp/encode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c index 5921f0d710..b42c747249 100644 --- a/src/lib/libcrypto/evp/encode.c +++ b/src/lib/libcrypto/evp/encode.c | |||
| @@ -85,7 +85,7 @@ | |||
| 85 | #define CHUNKS_PER_LINE (64/4) | 85 | #define CHUNKS_PER_LINE (64/4) |
| 86 | #define CHAR_PER_LINE (64+1) | 86 | #define CHAR_PER_LINE (64+1) |
| 87 | 87 | ||
| 88 | static unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\ | 88 | static const unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\ |
| 89 | abcdefghijklmnopqrstuvwxyz0123456789+/"; | 89 | abcdefghijklmnopqrstuvwxyz0123456789+/"; |
| 90 | 90 | ||
| 91 | /* 0xF0 is a EOLN | 91 | /* 0xF0 is a EOLN |
| @@ -102,7 +102,7 @@ abcdefghijklmnopqrstuvwxyz0123456789+/"; | |||
| 102 | #define B64_ERROR 0xFF | 102 | #define B64_ERROR 0xFF |
| 103 | #define B64_NOT_BASE64(a) (((a)|0x13) == 0xF3) | 103 | #define B64_NOT_BASE64(a) (((a)|0x13) == 0xF3) |
| 104 | 104 | ||
| 105 | static unsigned char data_ascii2bin[128]={ | 105 | static const unsigned char data_ascii2bin[128]={ |
| 106 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | 106 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, |
| 107 | 0xFF,0xE0,0xF0,0xFF,0xFF,0xF1,0xFF,0xFF, | 107 | 0xFF,0xE0,0xF0,0xFF,0xFF,0xF1,0xFF,0xFF, |
| 108 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, | 108 | 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, |