diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-06-07 01:34:44 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-06-07 01:34:44 +0200 |
| commit | 8e21c14607173ae5b0ea04c5a24b36514f6887f1 (patch) | |
| tree | f7405084c830e15fe0ee4590bac6139eeda90938 /crypto/x509/x509.h | |
| parent | Change PBE handling a bit more: now the key and iv generator does calls (diff) | |
| download | openssl-8e21c14607173ae5b0ea04c5a24b36514f6887f1.tar.xz openssl-8e21c14607173ae5b0ea04c5a24b36514f6887f1.zip | |
More PKCS#5 v2.0 development. Add a function to setup a PKCS#5 v2.0
AlgorithmIdentifier and make various ASN1 fixes.
Diffstat (limited to 'crypto/x509/x509.h')
| -rw-r--r-- | crypto/x509/x509.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 5106f2e592..5030d920e9 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -364,7 +364,7 @@ X509_ALGOR *encryption; } PBE2PARAM; typedef struct PBKDF2PARAM_st { -ASN1_OCTET_STRING *salt; +ASN1_TYPE *salt; /* Usually OCTET STRING but could be anything */ ASN1_INTEGER *iter; ASN1_INTEGER *keylength; X509_ALGOR *prf; @@ -906,6 +906,8 @@ PBEPARAM *PBEPARAM_new(void); PBEPARAM *d2i_PBEPARAM(PBEPARAM **a, unsigned char **pp, long length); void PBEPARAM_free(PBEPARAM *a); X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, int saltlen); +X509_ALGOR *PKCS5_pbe2_set(EVP_CIPHER *cipher, int iter, unsigned char *salt, + int saltlen); int i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **pp); PBKDF2PARAM *PBKDF2PARAM_new(void); |