diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /crypto/gf128mul.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'crypto/gf128mul.c')
-rw-r--r-- | crypto/gf128mul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/gf128mul.c b/crypto/gf128mul.c index a90d260528d4..df35e4ccd07e 100644 --- a/crypto/gf128mul.c +++ b/crypto/gf128mul.c | |||
@@ -89,7 +89,7 @@ | |||
89 | } | 89 | } |
90 | 90 | ||
91 | /* Given the value i in 0..255 as the byte overflow when a field element | 91 | /* Given the value i in 0..255 as the byte overflow when a field element |
92 | in GHASH is multipled by x^8, this function will return the values that | 92 | in GHASH is multiplied by x^8, this function will return the values that |
93 | are generated in the lo 16-bit word of the field value by applying the | 93 | are generated in the lo 16-bit word of the field value by applying the |
94 | modular polynomial. The values lo_byte and hi_byte are returned via the | 94 | modular polynomial. The values lo_byte and hi_byte are returned via the |
95 | macro xp_fun(lo_byte, hi_byte) so that the values can be assembled into | 95 | macro xp_fun(lo_byte, hi_byte) so that the values can be assembled into |