MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
#include <openssl/err.h>
+#include <openssl/hmac.h>
#include "digest.h"
#include "logger.h"
-bool digest_open_by_name(digest_t *digest, const char *name) {
+static void set_maclength(digest_t *digest, int maclength) {
+ int digestlen = EVP_MD_size(digest->digest);
+
+ if(maclength > digestlen || maclength < 0)
+ digest->maclength = digestlen;
+ else
+ digest->maclength = maclength;
+}
+
+bool digest_open_by_name(digest_t *digest, const char *name, int maclength) {
digest->digest = EVP_get_digestbyname(name);
- if(digest->digest)
- return true;
+ digest->key = NULL;
- logger(LOG_DEBUG, _("Unknown digest name '%s'!"), name);
- return false;
+ if(!digest->digest) {
+ logger(LOG_DEBUG, "Unknown digest name '%s'!", name);
+ return false;
+ }
+
+ set_maclength(digest, maclength);
+ return true;
}
-bool digest_open_by_nid(digest_t *digest, int nid) {
+bool digest_open_by_nid(digest_t *digest, int nid, int maclength) {
digest->digest = EVP_get_digestbynid(nid);
- if(digest->digest)
- return true;
+ digest->key = NULL;
- logger(LOG_DEBUG, _("Unknown digest nid %d!"), nid);
- return false;
+ if(!digest->digest) {
+ logger(LOG_DEBUG, "Unknown digest nid %d!", nid);
+ return false;
+ }
+
+ set_maclength(digest, maclength);
+ return true;
}
-bool digest_open_sha1(digest_t *digest) {
+bool digest_open_sha1(digest_t *digest, int maclength) {
digest->digest = EVP_sha1();
+ digest->key = NULL;
+
+ set_maclength(digest, maclength);
return true;
}
-void digest_close(digest_t *digest) {
+bool digest_set_key(digest_t *digest, const void *key, size_t len) {
+ digest->key = xrealloc(digest->key, len);
+ memcpy(digest->key, key, len);
+ digest->keylength = len;
+ return true;
}
-bool digest_create(digest_t *digest, void *indata, size_t inlen, void *outdata) {
- EVP_MD_CTX ctx;
-
- if(EVP_DigestInit(&ctx, digest->digest)
- && EVP_DigestUpdate(&ctx, indata, inlen)
- && EVP_DigestFinal(&ctx, outdata, NULL))
- return true;
-
- logger(LOG_DEBUG, _("Error creating digest: %s"), ERR_error_string(ERR_get_error(), NULL));
- return false;
+void digest_close(digest_t *digest) {
+ if(digest->key)
+ free(digest->key);
+ digest->key = NULL;
}
-bool digest_verify(digest_t *digest, void *indata, size_t inlen, void *cmpdata) {
+bool digest_create(digest_t *digest, const void *indata, size_t inlen, void *outdata) {
size_t len = EVP_MD_size(digest->digest);
- char outdata[len];
+ unsigned char tmpdata[len];
+
+ if(digest->key) {
+ HMAC(digest->digest, digest->key, digest->keylength, indata, inlen, tmpdata, NULL);
+ } else {
+ EVP_MD_CTX ctx;
+
+ if(!EVP_DigestInit(&ctx, digest->digest)
+ || !EVP_DigestUpdate(&ctx, indata, inlen)
+ || !EVP_DigestFinal(&ctx, tmpdata, NULL)) {
+ logger(LOG_DEBUG, "Error creating digest: %s", ERR_error_string(ERR_get_error(), NULL));
+ return false;
+ }
+ }
+
+ memcpy(outdata, tmpdata, digest->maclength);
+ return true;
+}
+
+bool digest_verify(digest_t *digest, const void *indata, size_t inlen, const void *cmpdata) {
+ size_t len = digest->maclength;
+ unsigned char outdata[len];
- return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, len);
+ return digest_create(digest, indata, inlen, outdata) && !memcmp(cmpdata, outdata, digest->maclength);
}
int digest_get_nid(const digest_t *digest) {
}
size_t digest_length(const digest_t *digest) {
- return EVP_MD_size(digest->digest);
+ return digest->maclength;
}
bool digest_active(const digest_t *digest) {