try other openssl hmac

[pam_pcsc_cr.git] / ossl_crypto.c

diff --git a/ossl_crypto.c b/ossl_crypto.c
index 4b475a4fcbe807d0e0d0894027873764861dba12..79a80eff034efb8ea1a2330be284df968d85cf41 100644 (file)
--- a/ossl_crypto.c
+++ b/ossl_crypto.c
@@ -2,8 +2,8 @@
 # include "config.h"
 #endif
 #include <openssl/err.h>
 # include "config.h"
 #endif
 #include <openssl/err.h>

+#include <openssl/aes.h>

 #include <openssl/sha.h>
 #include <openssl/sha.h>

-#include <openssl/evp.h>

 #include <openssl/hmac.h>
 
 #include "crypto_if.h"
 #include <openssl/hmac.h>
 
 #include "crypto_if.h"


@@ -17,46 +17,22 @@ static const char *ossl_init(void)
 static unsigned long ossl_encrypt(void *key, int keylen, void *iv,
                        void *pt, void *ct, int tlen)
 {
 static unsigned long ossl_encrypt(void *key, int keylen, void *iv,
                        void *pt, void *ct, int tlen)
 {

-       EVP_CIPHER_CTX ctx;
-       int outlen1, outlen2;
-       unsigned char hkey[16];
+       AES_KEY akey;

 
 

-       if (EVP_BytesToKey(EVP_aes_128_cbc(), EVP_sha1(),
-                       NULL, key, keylen, 5, hkey, NULL) != 16) return 1UL;
-       if (!EVP_EncryptInit(&ctx, EVP_aes_128_cbc(), hkey, iv))
+       if (AES_set_encrypt_key(key, keylen*8, &akey))

                return ERR_get_error();
                return ERR_get_error();

-       if (!EVP_EncryptUpdate(&ctx, ct, &outlen1, pt, tlen))
-               return ERR_get_error();
-       if (!EVP_EncryptFinal(&ctx, ct + outlen1, &outlen2))
-               return ERR_get_error();
-       if (outlen1 + outlen2 != tlen) {
-               printf("enc tlen =%d outlen1=%d outlen2=%d\n",
-                       tlen, outlen1, outlen2);
-               // return 1UL;
-       }
+       AES_cbc_encrypt(pt, ct, tlen, &akey, iv, AES_ENCRYPT);

        return 0UL;
 }
 
 static unsigned long ossl_decrypt(void *key, int keylen, void *iv,
                        void *ct, void *pt, int tlen)
 {
        return 0UL;
 }
 
 static unsigned long ossl_decrypt(void *key, int keylen, void *iv,
                        void *ct, void *pt, int tlen)
 {

-       EVP_CIPHER_CTX ctx;
-       int outlen1, outlen2;
-       unsigned char hkey[16];
+       AES_KEY akey;

 
 

-       if (EVP_BytesToKey(EVP_aes_128_cbc(), EVP_sha1(),
-                       NULL, key, keylen, 5, hkey, NULL) != 16) return 1UL;
-       if (!EVP_DecryptInit(&ctx, EVP_aes_128_cbc(), hkey, iv))
-               return ERR_get_error();
-       if (!EVP_DecryptUpdate(&ctx, ct, &outlen1, pt, tlen))
+       if (AES_set_decrypt_key(key, keylen*8, &akey))

                return ERR_get_error();
                return ERR_get_error();

-       if (!EVP_DecryptFinal(&ctx, ct + outlen1, &outlen2))
-               return ERR_get_error();
-       if (outlen1 + outlen2 != tlen) {
-               printf("dec tlen =%d outlen1=%d outlen2=%d\n",
-                       tlen, outlen1, outlen2);
-               // return 1UL;
-       }
+       AES_cbc_encrypt(ct, pt, tlen, &akey, iv, AES_DECRYPT);

        return 0UL;
 }
 
        return 0UL;
 }
 


@@ -67,16 +43,28 @@ static unsigned long ossl_hash(void *pt, int tlen, void *tag, int *taglen)
        if (!SHA1_Init(&sctx)) return ERR_get_error();
        if (!SHA1_Update(&sctx, pt, tlen)) return ERR_get_error();
        if (!SHA1_Final(tag, &sctx)) return ERR_get_error();
        if (!SHA1_Init(&sctx)) return ERR_get_error();
        if (!SHA1_Update(&sctx, pt, tlen)) return ERR_get_error();
        if (!SHA1_Final(tag, &sctx)) return ERR_get_error();

-       *taglen = 20;
+       *taglen = SHA_DIGEST_LENGTH;

        return 0UL;
 }
 
 static unsigned long ossl_hmac(void *pt, int tlen, void *key, int keylen,
                        void *tag, int *taglen)
 {
        return 0UL;
 }
 
 static unsigned long ossl_hmac(void *pt, int tlen, void *key, int keylen,
                        void *tag, int *taglen)
 {

-       if (!HMAC(EVP_sha1(), key, keylen, pt, tlen,
-                               tag, (unsigned int *)taglen))
-                       return ERR_get_error();
+#if 1
+       HMAC_CTX hctx;
+
+       HMAC_CTX_init(&hctx);
+       if (!HMAC_Init_ex(&hctx, key, keylen, EVP_sha1(), NULL))
+               return ERR_get_error();
+       if (!HMAC_Update(&hctx, pt, tlen)) return ERR_get_error();
+       if (!HMAC_Final(&hctx, tag, (unsigned int *)taglen))
+               return ERR_get_error();
+       HMAC_CTX_cleanup(&hctx);
+#else
+       if (HMAC(EVP_sha1(), key, keylen, pt, tlen,
+                               tag, (unsigned int *)taglen) != tag)
+               return ERR_get_error();
+#endif

        return 0UL;
 }
 
        return 0UL;
 }