← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nettle/vivid

« back to all changes in this revision

Viewing changes to cbc.h

  • Committer: Package Import Robot
  • Author(s): Magnus Holmgren
  • Date: 2012-08-25 18:28:37 UTC
  • mfrom: (1.5.1) (8.1.5 sid)
  • mto: (8.1.7 sid)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20120825182837-i7h4w03l7mxgvmqb
Tags: 2.5-1
http://bugs.debian.org/685855
* New upstream release (Closes: #685855).
  - All symbols from nettle-internal.c have been dropped from the built
    library, and pkcs1_signature_prefix renamed with a leading underscore,
    without SONAME change, as they were all for internal use only.
* debian/watch: Updated to handle -pre releases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cbc.h
5
5
 
6
6
/* nettle, low-level cryptographics library
7
7
 *
8
 
 * Copyright (C) 2001 Niels M�ller
 
8
 * Copyright (C) 2001 Niels Möller
9
9
 *  
10
10
 * The nettle library is free software; you can redistribute it and/or modify
11
11
 * it under the terms of the GNU Lesser General Public License as published by
37
37
#define cbc_decrypt nettle_cbc_decrypt
38
38
 
39
39
void
40
 
cbc_encrypt(void *ctx, nettle_crypt_func f,
 
40
cbc_encrypt(void *ctx, nettle_crypt_func *f,
41
41
            unsigned block_size, uint8_t *iv,
42
42
            unsigned length, uint8_t *dst,
43
43
            const uint8_t *src);
44
44
 
45
45
void
46
 
cbc_decrypt(void *ctx, nettle_crypt_func f,
 
46
cbc_decrypt(void *ctx, nettle_crypt_func *f,
47
47
            unsigned block_size, uint8_t *iv,
48
48
            unsigned length, uint8_t *dst,
49
49
            const uint8_t *src);
54
54
#define CBC_SET_IV(ctx, data) \
55
55
memcpy((ctx)->iv, (data), sizeof((ctx)->iv))
56
56
 
 
57
/* NOTE: Avoid using NULL, as we don't include anything defining it. */
57
58
#define CBC_ENCRYPT(self, f, length, dst, src)          \
58
 
(0 ? ((f)(&(self)->ctx, 0, NULL, NULL))                 \
 
59
(0 ? ((f)(&(self)->ctx, 0, (void *)0, (void *)0))                       \
59
60
   : cbc_encrypt((void *) &(self)->ctx,                 \
60
61
                 (nettle_crypt_func *) (f),             \
61
62
                 sizeof((self)->iv), (self)->iv,        \
62
63
                 (length), (dst), (src)))
63
64
 
64
65
#define CBC_DECRYPT(self, f, length, dst, src)          \
65
 
(0 ? ((f)(&(self)->ctx, 0, NULL, NULL))                 \
 
66
(0 ? ((f)(&(self)->ctx, 0, (void *)0, (void *)0))                       \
66
67
   : cbc_decrypt((void *) &(self)->ctx,                 \
67
68
                 (nettle_crypt_func *) (f),             \
68
69
                 sizeof((self)->iv), (self)->iv,        \