diff options
Diffstat (limited to 'src/lib/libcrypto/evp')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_pbe.c | 24 | ||||
| -rw-r--r-- | src/lib/libcrypto/evp/p5_crpt2.c | 11 |
2 files changed, 0 insertions, 35 deletions
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index 779c1592da..dc8b5f51fc 100644 --- a/src/lib/libcrypto/evp/evp_pbe.c +++ b/src/lib/libcrypto/evp/evp_pbe.c | |||
| @@ -111,30 +111,6 @@ static const EVP_PBE_CTL builtin_pbe[] = { | |||
| 111 | {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0}, | 111 | {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0}, |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | #ifdef TEST | ||
| 115 | int | ||
| 116 | main(int argc, char **argv) | ||
| 117 | { | ||
| 118 | int i, nid_md, nid_cipher; | ||
| 119 | EVP_PBE_CTL *tpbe, *tpbe2; | ||
| 120 | /*OpenSSL_add_all_algorithms();*/ | ||
| 121 | |||
| 122 | for (i = 0; i < sizeof(builtin_pbe) / sizeof(EVP_PBE_CTL); i++) { | ||
| 123 | tpbe = builtin_pbe + i; | ||
| 124 | fprintf(stderr, "%d %d %s ", tpbe->pbe_type, tpbe->pbe_nid, | ||
| 125 | OBJ_nid2sn(tpbe->pbe_nid)); | ||
| 126 | if (EVP_PBE_find(tpbe->pbe_type, tpbe->pbe_nid, | ||
| 127 | &nid_cipher , &nid_md, 0)) | ||
| 128 | fprintf(stderr, "Found %s %s\n", | ||
| 129 | OBJ_nid2sn(nid_cipher), OBJ_nid2sn(nid_md)); | ||
| 130 | else | ||
| 131 | fprintf(stderr, "Find ERROR!!\n"); | ||
| 132 | } | ||
| 133 | |||
| 134 | return 0; | ||
| 135 | } | ||
| 136 | #endif | ||
| 137 | |||
| 138 | int | 114 | int |
| 139 | EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, | 115 | EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, |
| 140 | ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de) | 116 | ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de) |
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c index c276cd28b8..ca68ac0d94 100644 --- a/src/lib/libcrypto/evp/p5_crpt2.c +++ b/src/lib/libcrypto/evp/p5_crpt2.c | |||
| @@ -166,17 +166,6 @@ PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen, const unsigned char *salt, | |||
| 166 | EVP_sha1(), keylen, out); | 166 | EVP_sha1(), keylen, out); |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | #ifdef DO_TEST | ||
| 170 | main() | ||
| 171 | { | ||
| 172 | unsigned char out[4]; | ||
| 173 | unsigned char salt[] = {0x12, 0x34, 0x56, 0x78}; | ||
| 174 | PKCS5_PBKDF2_HMAC_SHA1("password", -1, salt, 4, 5, 4, out); | ||
| 175 | fprintf(stderr, "Out %02X %02X %02X %02X\n", | ||
| 176 | out[0], out[1], out[2], out[3]); | ||
| 177 | } | ||
| 178 | #endif | ||
| 179 | |||
| 180 | /* Now the key derivation function itself. This is a bit evil because | 169 | /* Now the key derivation function itself. This is a bit evil because |
| 181 | * it has to check the ASN1 parameters are valid: and there are quite a | 170 | * it has to check the ASN1 parameters are valid: and there are quite a |
| 182 | * few of them... | 171 | * few of them... |
