diff options
Diffstat (limited to 'src/lib/libcrypto/hmac/hm_ameth.c')
-rw-r--r-- | src/lib/libcrypto/hmac/hm_ameth.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/libcrypto/hmac/hm_ameth.c b/src/lib/libcrypto/hmac/hm_ameth.c index ef97918472..c3e9038c0c 100644 --- a/src/lib/libcrypto/hmac/hm_ameth.c +++ b/src/lib/libcrypto/hmac/hm_ameth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: hm_ameth.c,v 1.5 2014/06/21 12:00:01 miod Exp $ */ | 1 | /* $OpenBSD: hm_ameth.c,v 1.6 2014/06/21 13:39:46 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2007. | 3 | * project 2007. |
4 | */ | 4 | */ |
@@ -10,7 +10,7 @@ | |||
10 | * are met: | 10 | * are met: |
11 | * | 11 | * |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. |
14 | * | 14 | * |
15 | * 2. Redistributions in binary form must reproduce the above copyright | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
16 | * notice, this list of conditions and the following disclaimer in | 16 | * notice, this list of conditions and the following disclaimer in |
@@ -134,14 +134,13 @@ old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder) | |||
134 | if (inc) | 134 | if (inc) |
135 | *pder += os->length; | 135 | *pder += os->length; |
136 | } | 136 | } |
137 | 137 | ||
138 | return os->length; | 138 | return os->length; |
139 | } | 139 | } |
140 | 140 | ||
141 | #endif | 141 | #endif |
142 | 142 | ||
143 | const EVP_PKEY_ASN1_METHOD | 143 | const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = { |
144 | hmac_asn1_meth = { | ||
145 | .pkey_id = EVP_PKEY_HMAC, | 144 | .pkey_id = EVP_PKEY_HMAC, |
146 | .pkey_base_id = EVP_PKEY_HMAC, | 145 | .pkey_base_id = EVP_PKEY_HMAC, |
147 | 146 | ||