summaryrefslogtreecommitdiffstats
path: root/lib/libcrypto/evp/encode.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2010-10-01 22:58:41 +0000
committerdjm <djm@openbsd.org>2010-10-01 22:58:41 +0000
commit0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch)
tree9173c770f38c55515569708729da7e02172d3f3d /lib/libcrypto/evp/encode.c
parentimport OpenSSL-1.0.0a (diff)
downloadwireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz
wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/evp/encode.c')
-rw-r--r--lib/libcrypto/evp/encode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/evp/encode.c b/lib/libcrypto/evp/encode.c
index 5921f0d710d..b42c7472493 100644
--- a/lib/libcrypto/evp/encode.c
+++ b/lib/libcrypto/evp/encode.c
@@ -85,7 +85,7 @@
#define CHUNKS_PER_LINE (64/4)
#define CHAR_PER_LINE (64+1)
-static unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+static const unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\
abcdefghijklmnopqrstuvwxyz0123456789+/";
/* 0xF0 is a EOLN
@@ -102,7 +102,7 @@ abcdefghijklmnopqrstuvwxyz0123456789+/";
#define B64_ERROR 0xFF
#define B64_NOT_BASE64(a) (((a)|0x13) == 0xF3)
-static unsigned char data_ascii2bin[128]={
+static const unsigned char data_ascii2bin[128]={
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0xFF,0xE0,0xF0,0xFF,0xFF,0xF1,0xFF,0xFF,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,