comparison des.c @ 993:f8db9a2bae05 libavutil

Add av_ prefix to bswap macros
author mru
date Sat, 10 Jul 2010 22:12:30 +0000
parents a13125b5be3a
children
comparison
equal deleted inserted replaced
992:a13125b5be3a 993:f8db9a2bae05
295 } 295 }
296 return 0; 296 return 0;
297 } 297 }
298 298
299 void av_des_crypt(AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt) { 299 void av_des_crypt(AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt) {
300 uint64_t iv_val = iv ? be2ne_64(*(uint64_t *)iv) : 0; 300 uint64_t iv_val = iv ? av_be2ne64(*(uint64_t *)iv) : 0;
301 while (count-- > 0) { 301 while (count-- > 0) {
302 uint64_t dst_val; 302 uint64_t dst_val;
303 uint64_t src_val = src ? be2ne_64(*(const uint64_t *)src) : 0; 303 uint64_t src_val = src ? av_be2ne64(*(const uint64_t *)src) : 0;
304 if (decrypt) { 304 if (decrypt) {
305 uint64_t tmp = src_val; 305 uint64_t tmp = src_val;
306 if (d->triple_des) { 306 if (d->triple_des) {
307 src_val = des_encdec(src_val, d->round_keys[2], 1); 307 src_val = des_encdec(src_val, d->round_keys[2], 1);
308 src_val = des_encdec(src_val, d->round_keys[1], 0); 308 src_val = des_encdec(src_val, d->round_keys[1], 0);
315 dst_val = des_encdec(dst_val, d->round_keys[1], 1); 315 dst_val = des_encdec(dst_val, d->round_keys[1], 1);
316 dst_val = des_encdec(dst_val, d->round_keys[2], 0); 316 dst_val = des_encdec(dst_val, d->round_keys[2], 0);
317 } 317 }
318 iv_val = iv ? dst_val : 0; 318 iv_val = iv ? dst_val : 0;
319 } 319 }
320 *(uint64_t *)dst = be2ne_64(dst_val); 320 *(uint64_t *)dst = av_be2ne64(dst_val);
321 src += 8; 321 src += 8;
322 dst += 8; 322 dst += 8;
323 } 323 }
324 if (iv) 324 if (iv)
325 *(uint64_t *)iv = be2ne_64(iv_val); 325 *(uint64_t *)iv = av_be2ne64(iv_val);
326 } 326 }
327 327
328 #ifdef TEST 328 #ifdef TEST
329 #undef printf 329 #undef printf
330 #undef rand 330 #undef rand