comparison: libidav/crypto.c
libidav/crypto.c
- changeset 789
- 378b5ab86f77
- parent 747
- efbd59642577
- child 791
- 38796c7e32b6
equal
deleted
inserted
replaced
| 788:9b9420041d8e | 789:378b5ab86f77 |
|---|---|
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include <stdio.h> | 29 #include <stdio.h> |
| 30 #include <stdlib.h> | 30 #include <stdlib.h> |
| 31 #include <string.h> | 31 #include <string.h> |
| 32 #include <fcntl.h> | |
| 33 | |
| 34 #ifndef _WIN32 | |
| 32 #include <unistd.h> | 35 #include <unistd.h> |
| 33 #include <fcntl.h> | 36 #endif |
| 37 | |
| 34 #include "utils.h" | 38 #include "utils.h" |
| 35 | 39 |
| 36 #include "crypto.h" | 40 #include "crypto.h" |
| 37 | 41 |
| 38 /* -------------------- OpenSSL Crypto Functions -------------------- */ | 42 /* -------------------- OpenSSL Crypto Functions -------------------- */ |
| 1193 if(enc->ivlen < 16) { | 1197 if(enc->ivlen < 16) { |
| 1194 size_t copy_iv_len = 16 - enc->ivlen; | 1198 size_t copy_iv_len = 16 - enc->ivlen; |
| 1195 copy_iv_len = len > copy_iv_len ? copy_iv_len : len; | 1199 copy_iv_len = len > copy_iv_len ? copy_iv_len : len; |
| 1196 | 1200 |
| 1197 memcpy(buf, enc->iv, copy_iv_len); | 1201 memcpy(buf, enc->iv, copy_iv_len); |
| 1198 buf += copy_iv_len; | 1202 (char*)buf += copy_iv_len; |
| 1199 len -= copy_iv_len; | 1203 len -= copy_iv_len; |
| 1200 nread = copy_iv_len; | 1204 nread = copy_iv_len; |
| 1201 | 1205 |
| 1202 enc->ivlen += copy_iv_len; | 1206 enc->ivlen += copy_iv_len; |
| 1203 | 1207 |
