ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/vendor-crypto/openssl/dist/crypto/aes/aes_ofb.c
(Generate patch)

Comparing vendor-crypto/openssl/dist/crypto/aes/aes_ofb.c (file contents):
Revision 6975 by laffer1, Sun Oct 12 20:29:54 2014 UTC vs.
Revision 6976 by laffer1, Fri Mar 20 00:01:13 2015 UTC

# Line 7 | Line 7
7   * are met:
8   *
9   * 1. Redistributions of source code must retain the above copyright
10 < *    notice, this list of conditions and the following disclaimer.
10 > *    notice, this list of conditions and the following disclaimer.
11   *
12   * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in
# Line 54 | Line 54
54   * This package is an SSL implementation written
55   * by Eric Young (eay@cryptsoft.com).
56   * The implementation was written so as to conform with Netscapes SSL.
57 < *
57 > *
58   * This library is free for commercial and non-commercial use as long as
59   * the following conditions are aheared to.  The following conditions
60   * apply to all code found in this distribution, be it the RC4, RSA,
61   * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
62   * included with this distribution is covered by the same copyright terms
63   * except that the holder is Tim Hudson (tjh@cryptsoft.com).
64 < *
64 > *
65   * Copyright remains Eric Young's, and as such any Copyright notices in
66   * the code are not to be removed.
67   * If this package is used in a product, Eric Young should be given attribution
68   * as the author of the parts of the library used.
69   * This can be in the form of a textual message at program startup or
70   * in documentation (online or textual) provided with the package.
71 < *
71 > *
72   * Redistribution and use in source and binary forms, with or without
73   * modification, are permitted provided that the following conditions
74   * are met:
# Line 83 | Line 83
83   *     Eric Young (eay@cryptsoft.com)"
84   *    The word 'cryptographic' can be left out if the rouines from the library
85   *    being used are not cryptographic related :-).
86 < * 4. If you include any Windows specific code (or a derivative thereof) from
86 > * 4. If you include any Windows specific code (or a derivative thereof) from
87   *    the apps directory (application code) you must include an acknowledgement:
88   *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
89 < *
89 > *
90   * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
91   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
92   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# Line 98 | Line 98
98   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
99   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
100   * SUCH DAMAGE.
101 < *
101 > *
102   * The licence and distribution terms for any publically available version or
103   * derivative of this code cannot be changed.  i.e. this code cannot simply be
104   * copied and put under another distribution licence
# Line 115 | Line 115
115   #include <openssl/aes.h>
116   #include "aes_locl.h"
117  
118 < /* The input and output encrypted as though 128bit ofb mode is being
119 < * used.  The extra state information to record how much of the
120 < * 128bit block we have used is contained in *num;
118 > /*
119 > * The input and output encrypted as though 128bit ofb mode is being used.
120 > * The extra state information to record how much of the 128bit block we have
121 > * used is contained in *num;
122   */
123   void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
124 <        const unsigned long length, const AES_KEY *key,
125 <        unsigned char *ivec, int *num) {
124 >                        const unsigned long length, const AES_KEY *key,
125 >                        unsigned char *ivec, int *num)
126 > {
127  
128 <        unsigned int n;
129 <        unsigned long l=length;
128 >    unsigned int n;
129 >    unsigned long l = length;
130  
131 <        assert(in && out && key && ivec && num);
131 >    assert(in && out && key && ivec && num);
132  
133 <        n = *num;
133 >    n = *num;
134  
135 <        while (l--) {
136 <                if (n == 0) {
137 <                        AES_encrypt(ivec, ivec, key);
138 <                }
139 <                *(out++) = *(in++) ^ ivec[n];
140 <                n = (n+1) % AES_BLOCK_SIZE;
141 <        }
135 >    while (l--) {
136 >        if (n == 0) {
137 >            AES_encrypt(ivec, ivec, key);
138 >        }
139 >        *(out++) = *(in++) ^ ivec[n];
140 >        n = (n + 1) % AES_BLOCK_SIZE;
141 >    }
142  
143 <        *num=n;
143 >    *num = n;
144   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines