summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r--src/lib/libcrypto/x509/by_dir.c4
-rw-r--r--src/lib/libcrypto/x509/by_file.c4
-rw-r--r--src/lib/libcrypto/x509/x_all.c120
3 files changed, 64 insertions, 64 deletions
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 3b72fd302f..76f8244f36 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -113,8 +113,8 @@ X509_LOOKUP_METHOD x509_dir_lookup = {
113 NULL, /* get_by_alias */ 113 NULL, /* get_by_alias */
114}; 114};
115 115
116X509_LOOKUP_METHOD 116X509_LOOKUP_METHOD *
117*X509_LOOKUP_hash_dir(void) 117X509_LOOKUP_hash_dir(void)
118{ 118{
119 return (&x509_dir_lookup); 119 return (&x509_dir_lookup);
120} 120}
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 474d13bf0e..93c951ee2a 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -84,8 +84,8 @@ X509_LOOKUP_METHOD x509_file_lookup = {
84 NULL, /* get_by_alias */ 84 NULL, /* get_by_alias */
85}; 85};
86 86
87X509_LOOKUP_METHOD 87X509_LOOKUP_METHOD *
88*X509_LOOKUP_file(void) 88X509_LOOKUP_file(void)
89{ 89{
90 return (&x509_file_lookup); 90 return (&x509_file_lookup);
91} 91}
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index 59099f026f..2edec16022 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -147,8 +147,8 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
147} 147}
148 148
149#ifndef OPENSSL_NO_FP_API 149#ifndef OPENSSL_NO_FP_API
150X509 150X509 *
151*d2i_X509_fp(FILE *fp, X509 **x509) 151d2i_X509_fp(FILE *fp, X509 **x509)
152{ 152{
153 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509); 153 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509);
154} 154}
@@ -160,8 +160,8 @@ i2d_X509_fp(FILE *fp, X509 *x509)
160} 160}
161#endif 161#endif
162 162
163X509 163X509 *
164*d2i_X509_bio(BIO *bp, X509 **x509) 164d2i_X509_bio(BIO *bp, X509 **x509)
165{ 165{
166 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509); 166 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509);
167} 167}
@@ -173,8 +173,8 @@ i2d_X509_bio(BIO *bp, X509 *x509)
173} 173}
174 174
175#ifndef OPENSSL_NO_FP_API 175#ifndef OPENSSL_NO_FP_API
176X509_CRL 176X509_CRL *
177*d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) 177d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl)
178{ 178{
179 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); 179 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl);
180} 180}
@@ -186,8 +186,8 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl)
186} 186}
187#endif 187#endif
188 188
189X509_CRL 189X509_CRL *
190*d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) 190d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl)
191{ 191{
192 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); 192 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl);
193} 193}
@@ -199,8 +199,8 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl)
199} 199}
200 200
201#ifndef OPENSSL_NO_FP_API 201#ifndef OPENSSL_NO_FP_API
202PKCS7 202PKCS7 *
203*d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) 203d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
204{ 204{
205 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); 205 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7);
206} 206}
@@ -212,8 +212,8 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
212} 212}
213#endif 213#endif
214 214
215PKCS7 215PKCS7 *
216*d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) 216d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
217{ 217{
218 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); 218 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7);
219} 219}
@@ -225,8 +225,8 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
225} 225}
226 226
227#ifndef OPENSSL_NO_FP_API 227#ifndef OPENSSL_NO_FP_API
228X509_REQ 228X509_REQ *
229*d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) 229d2i_X509_REQ_fp(FILE *fp, X509_REQ **req)
230{ 230{
231 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); 231 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req);
232} 232}
@@ -238,8 +238,8 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req)
238} 238}
239#endif 239#endif
240 240
241X509_REQ 241X509_REQ *
242*d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) 242d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
243{ 243{
244 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); 244 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req);
245} 245}
@@ -253,8 +253,8 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req)
253#ifndef OPENSSL_NO_RSA 253#ifndef OPENSSL_NO_RSA
254 254
255#ifndef OPENSSL_NO_FP_API 255#ifndef OPENSSL_NO_FP_API
256RSA 256RSA *
257*d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) 257d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa)
258{ 258{
259 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); 259 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa);
260} 260}
@@ -265,15 +265,15 @@ i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa)
265 return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); 265 return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa);
266} 266}
267 267
268RSA 268RSA *
269*d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) 269d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa)
270{ 270{
271 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); 271 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa);
272} 272}
273 273
274 274
275RSA 275RSA *
276*d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) 276d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa)
277{ 277{
278 return ASN1_d2i_fp((void *(*)(void))RSA_new, 278 return ASN1_d2i_fp((void *(*)(void))RSA_new,
279 (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa); 279 (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa);
@@ -292,8 +292,8 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa)
292} 292}
293#endif 293#endif
294 294
295RSA 295RSA *
296*d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) 296d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa)
297{ 297{
298 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); 298 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa);
299} 299}
@@ -304,15 +304,15 @@ i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa)
304 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); 304 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa);
305} 305}
306 306
307RSA 307RSA *
308*d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) 308d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa)
309{ 309{
310 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); 310 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa);
311} 311}
312 312
313 313
314RSA 314RSA *
315*d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) 315d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa)
316{ 316{
317 return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa); 317 return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa);
318} 318}
@@ -332,8 +332,8 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa)
332 332
333#ifndef OPENSSL_NO_DSA 333#ifndef OPENSSL_NO_DSA
334#ifndef OPENSSL_NO_FP_API 334#ifndef OPENSSL_NO_FP_API
335DSA 335DSA *
336*d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) 336d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
337{ 337{
338 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa); 338 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa);
339} 339}
@@ -344,8 +344,8 @@ i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa)
344 return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa); 344 return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa);
345} 345}
346 346
347DSA 347DSA *
348*d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) 348d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa)
349{ 349{
350 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa); 350 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa);
351} 351}
@@ -357,8 +357,8 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa)
357} 357}
358#endif 358#endif
359 359
360DSA 360DSA *
361*d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) 361d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
362{ 362{
363 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa); 363 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa);
364} 364}
@@ -369,8 +369,8 @@ i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa)
369 return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa); 369 return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa);
370} 370}
371 371
372DSA 372DSA *
373*d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) 373d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa)
374{ 374{
375 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa); 375 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa);
376} 376}
@@ -385,8 +385,8 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa)
385 385
386#ifndef OPENSSL_NO_EC 386#ifndef OPENSSL_NO_EC
387#ifndef OPENSSL_NO_FP_API 387#ifndef OPENSSL_NO_FP_API
388EC_KEY 388EC_KEY *
389*d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) 389d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
390{ 390{
391 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey); 391 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey);
392} 392}
@@ -397,8 +397,8 @@ i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey)
397 return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey); 397 return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey);
398} 398}
399 399
400EC_KEY 400EC_KEY *
401*d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) 401d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey)
402{ 402{
403 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); 403 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey);
404} 404}
@@ -409,8 +409,8 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey)
409 return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); 409 return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
410} 410}
411#endif 411#endif
412EC_KEY 412EC_KEY *
413*d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) 413d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
414{ 414{
415 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey); 415 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey);
416} 416}
@@ -421,8 +421,8 @@ i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *ecdsa)
421 return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa); 421 return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa);
422} 422}
423 423
424EC_KEY 424EC_KEY *
425*d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) 425d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey)
426{ 426{
427 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); 427 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey);
428} 428}
@@ -488,8 +488,8 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
488 488
489 489
490#ifndef OPENSSL_NO_FP_API 490#ifndef OPENSSL_NO_FP_API
491X509_SIG 491X509_SIG *
492*d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) 492d2i_PKCS8_fp(FILE *fp, X509_SIG **p8)
493{ 493{
494 return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8); 494 return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8);
495} 495}
@@ -501,8 +501,8 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8)
501} 501}
502#endif 502#endif
503 503
504X509_SIG 504X509_SIG *
505*d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) 505d2i_PKCS8_bio(BIO *bp, X509_SIG **p8)
506{ 506{
507 return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8); 507 return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8);
508} 508}
@@ -514,8 +514,8 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
514} 514}
515 515
516#ifndef OPENSSL_NO_FP_API 516#ifndef OPENSSL_NO_FP_API
517PKCS8_PRIV_KEY_INFO 517PKCS8_PRIV_KEY_INFO *
518*d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, 518d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
519PKCS8_PRIV_KEY_INFO **p8inf) 519PKCS8_PRIV_KEY_INFO **p8inf)
520{ 520{
521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
@@ -548,8 +548,8 @@ i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey)
548 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); 548 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey);
549} 549}
550 550
551EVP_PKEY 551EVP_PKEY *
552*d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) 552d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a)
553{ 553{
554 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, 554 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey,
555 fp, a); 555 fp, a);
@@ -561,16 +561,16 @@ i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey)
561 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey); 561 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey);
562} 562}
563 563
564EVP_PKEY 564EVP_PKEY *
565*d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) 565d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
566{ 566{
567 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a); 567 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a);
568} 568}
569 569
570#endif 570#endif
571 571
572PKCS8_PRIV_KEY_INFO 572PKCS8_PRIV_KEY_INFO *
573*d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, 573d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
574PKCS8_PRIV_KEY_INFO **p8inf) 574PKCS8_PRIV_KEY_INFO **p8inf)
575{ 575{
576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
@@ -603,8 +603,8 @@ i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey)
603 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); 603 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey);
604} 604}
605 605
606EVP_PKEY 606EVP_PKEY *
607*d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) 607d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
608{ 608{
609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a); 609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a);
610} 610}
@@ -615,8 +615,8 @@ i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey)
615 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey); 615 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey);
616} 616}
617 617
618EVP_PKEY 618EVP_PKEY *
619*d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) 619d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a)
620{ 620{
621 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a); 621 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a);
622} 622}