diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-23 09:10:28 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2010-07-23 09:10:28 +0200 |
commit | 6fbb3400ff70070dc12460c5336b201cfa275ab4 (patch) | |
tree | 6ffd48aec7a4b511555186b0a7c781a6b7d637d6 /examples/pk.c | |
parent | f58e82a071a25531f7e7f83cc4ed8982131dea5c (diff) | |
download | cryptodev-linux-6fbb3400ff70070dc12460c5336b201cfa275ab4.tar.gz cryptodev-linux-6fbb3400ff70070dc12460c5336b201cfa275ab4.tar.xz cryptodev-linux-6fbb3400ff70070dc12460c5336b201cfa275ab4.zip |
Splitted key from key_params structure. Also separated dsa from rsa structure in params.
Diffstat (limited to 'examples/pk.c')
-rw-r--r-- | examples/pk.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/examples/pk.c b/examples/pk.c index 1f3d3c1..fef695c 100644 --- a/examples/pk.c +++ b/examples/pk.c @@ -363,12 +363,12 @@ static int rsa_key_encrypt(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int oae /* do encryption */ memset(&nop, 0, sizeof(nop)); nop.init.algorithm = NCR_ALG_RSA; - nop.init.params.key = pubkey; + nop.init.key = pubkey; if (oaep) { - nop.init.params.params.pk.type = RSA_PKCS1_OAEP; - nop.init.params.params.pk.oaep_hash = NCR_ALG_SHA1; + nop.init.params.params.rsa.type = RSA_PKCS1_OAEP; + nop.init.params.params.rsa.oaep_hash = NCR_ALG_SHA1; } else { - nop.init.params.params.pk.type = RSA_PKCS1_V1_5; + nop.init.params.params.rsa.type = RSA_PKCS1_V1_5; } nop.init.op = NCR_OP_ENCRYPT; nop.op.data.cipher.plaintext = datad; @@ -383,13 +383,13 @@ static int rsa_key_encrypt(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int oae /* decrypt data */ memset(&nop, 0, sizeof(nop)); nop.init.algorithm = NCR_ALG_RSA; - nop.init.params.key = privkey; + nop.init.key = privkey; nop.init.op = NCR_OP_DECRYPT; if (oaep) { - nop.init.params.params.pk.type = RSA_PKCS1_OAEP; - nop.init.params.params.pk.oaep_hash = NCR_ALG_SHA1; + nop.init.params.params.rsa.type = RSA_PKCS1_OAEP; + nop.init.params.params.rsa.oaep_hash = NCR_ALG_SHA1; } else { - nop.init.params.params.pk.type = RSA_PKCS1_V1_5; + nop.init.params.params.rsa.type = RSA_PKCS1_V1_5; } nop.op.data.cipher.plaintext = encd; nop.op.data.cipher.ciphertext = encd; @@ -461,9 +461,9 @@ static int rsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int /* sign datad */ memset(&nop, 0, sizeof(nop)); nop.init.algorithm = NCR_ALG_RSA; - nop.init.params.key = privkey; - nop.init.params.params.pk.type = (pss!=0)?RSA_PKCS1_PSS:RSA_PKCS1_V1_5; - nop.init.params.params.pk.sign_hash = NCR_ALG_SHA1; + nop.init.key = privkey; + nop.init.params.params.rsa.type = (pss!=0)?RSA_PKCS1_PSS:RSA_PKCS1_V1_5; + nop.init.params.params.rsa.sign_hash = NCR_ALG_SHA1; nop.init.op = NCR_OP_SIGN; nop.op.data.sign.text = datad; @@ -478,9 +478,9 @@ static int rsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey, int /* verify signature */ memset(&nop, 0, sizeof(nop)); nop.init.algorithm = NCR_ALG_RSA; - nop.init.params.key = pubkey; - nop.init.params.params.pk.type = (pss!=0)?RSA_PKCS1_PSS:RSA_PKCS1_V1_5; - nop.init.params.params.pk.sign_hash = NCR_ALG_SHA1; + nop.init.key = pubkey; + nop.init.params.params.rsa.type = (pss!=0)?RSA_PKCS1_PSS:RSA_PKCS1_V1_5; + nop.init.params.params.rsa.sign_hash = NCR_ALG_SHA1; nop.init.op = NCR_OP_VERIFY; nop.op.data.verify.text = datad; @@ -541,8 +541,8 @@ static int dsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey) /* sign datad */ memset(&nop, 0, sizeof(nop)); nop.init.algorithm = NCR_ALG_DSA; - nop.init.params.key = privkey; - nop.init.params.params.pk.sign_hash = NCR_ALG_SHA1; + nop.init.key = privkey; + nop.init.params.params.dsa.sign_hash = NCR_ALG_SHA1; nop.init.op = NCR_OP_SIGN; nop.op.data.sign.text = datad; @@ -557,8 +557,8 @@ static int dsa_key_sign_verify(int cfd, ncr_key_t privkey, ncr_key_t pubkey) /* verify signature */ memset(&nop, 0, sizeof(nop)); nop.init.algorithm = NCR_ALG_DSA; - nop.init.params.key = pubkey; - nop.init.params.params.pk.sign_hash = NCR_ALG_SHA1; + nop.init.key = pubkey; + nop.init.params.params.dsa.sign_hash = NCR_ALG_SHA1; nop.init.op = NCR_OP_VERIFY; nop.op.data.verify.text = datad; |