diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-04-10 11:48:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-04-10 11:48:35 +0000 |
| commit | 29db322e8f2b0568322b80e3be28446463d74010 (patch) | |
| tree | 1b029fa74c8f2a345cef7b1013e6785208f22e75 /crypto/rsa/rsa_pmeth.c | |
| parent | 25dc89eb9b00d4a8596f81f2add8218274ee998e (diff) | |
Beginnings of PSS support.
Diffstat (limited to 'crypto/rsa/rsa_pmeth.c')
| -rw-r--r-- | crypto/rsa/rsa_pmeth.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 696eef9332..989a7d794d 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -79,6 +79,8 @@ typedef struct int pad_mode; /* message digest */ const EVP_MD *md; + /* PSS seedlength */ + int pss_seedlen; /* Temp buffer */ unsigned char *tbuf; } RSA_PKEY_CTX; @@ -95,6 +97,8 @@ static int pkey_rsa_init(EVP_PKEY_CTX *ctx) rctx->md = NULL; rctx->tbuf = NULL; + rctx->pss_seedlen = 0; + ctx->data = rctx; return 1; @@ -321,13 +325,18 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) switch (type) { case EVP_PKEY_CTRL_RSA_PADDING: - /* TODO: add PSS support */ - if ((p1 >= RSA_PKCS1_PADDING) && (p1 <= RSA_X931_PADDING)) + if ((p1 >= RSA_PKCS1_PADDING) && (p1 <= RSA_PKCS1_PSS_PADDING)) { - if (ctx->operation == EVP_PKEY_OP_KEYGEN) + if (ctx->operation & EVP_PKEY_OP_TYPE_GEN) return -2; if (!check_padding_md(rctx->md, p1)) return 0; + if ((p1 == RSA_PKCS1_PSS_PADDING) + && !(ctx->operation & EVP_PKEY_OP_TYPE_SIG)) + return -2; + if ((p1 == RSA_PKCS1_OAEP_PADDING) + && !(ctx->operation & EVP_PKEY_OP_TYPE_CRYPT)) + return -2; rctx->pad_mode = p1; return 1; } @@ -363,6 +372,8 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx, pm = RSA_PKCS1_OAEP_PADDING; else if (!strcmp(value, "x931")) pm = RSA_X931_PADDING; + else if (!strcmp(value, "pss")) + pm = RSA_PKCS1_PSS_PADDING; else return -2; return EVP_PKEY_CTX_set_rsa_padding(ctx, pm); |