Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(632)

Side by Side Diff: openssl/crypto/evp/evp_locl.h

Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support. Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « openssl/crypto/evp/evp_err.c ('k') | openssl/crypto/poly1305/Makefile » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* evp_locl.h */ 1 /* evp_locl.h */
2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
5 /* ==================================================================== 5 /* ====================================================================
6 * Copyright (c) 1999 The OpenSSL Project. All rights reserved. 6 * Copyright (c) 1999 The OpenSSL Project. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 341
342 342
343 } /* EVP_PKEY_METHOD */; 343 } /* EVP_PKEY_METHOD */;
344 344
345 void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx); 345 void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
346 346
347 int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 347 int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
348 ASN1_TYPE *param, 348 ASN1_TYPE *param,
349 const EVP_CIPHER *c, const EVP_MD *md, int en_de); 349 const EVP_CIPHER *c, const EVP_MD *md, int en_de);
350 350
351 /* EVP_AEAD represents a specific AEAD algorithm. */
352 struct evp_aead_st {
353 unsigned char key_len;
354 unsigned char nonce_len;
355 unsigned char overhead;
356 unsigned char max_tag_len;
357
358 int (*init) (struct evp_aead_ctx_st*, const unsigned char *key,
359 size_t key_len, size_t tag_len);
360 void (*cleanup) (struct evp_aead_ctx_st*);
361
362 ssize_t (*seal) (const struct evp_aead_ctx_st *ctx,
363 unsigned char *out, size_t max_out_len,
364 const unsigned char *nonce, size_t nonce_len,
365 const unsigned char *in, size_t in_len,
366 const unsigned char *ad, size_t ad_len);
367
368 ssize_t (*open) (const struct evp_aead_ctx_st *ctx,
369 unsigned char *out, size_t max_out_len,
370 const unsigned char *nonce, size_t nonce_len,
371 const unsigned char *in, size_t in_len,
372 const unsigned char *ad, size_t ad_len);
373 };
374
351 #ifdef OPENSSL_FIPS 375 #ifdef OPENSSL_FIPS
352 376
353 #ifdef OPENSSL_DOING_MAKEDEPEND 377 #ifdef OPENSSL_DOING_MAKEDEPEND
354 #undef SHA1_Init 378 #undef SHA1_Init
355 #undef SHA1_Update 379 #undef SHA1_Update
356 #undef SHA224_Init 380 #undef SHA224_Init
357 #undef SHA256_Init 381 #undef SHA256_Init
358 #undef SHA384_Init 382 #undef SHA384_Init
359 #undef SHA512_Init 383 #undef SHA512_Init
360 #undef DES_set_key_unchecked 384 #undef DES_set_key_unchecked
(...skipping 15 matching lines...) Expand all
376 #define BF_set_key private_BF_set_key 400 #define BF_set_key private_BF_set_key
377 #define CAST_set_key private_CAST_set_key 401 #define CAST_set_key private_CAST_set_key
378 #define idea_set_encrypt_key private_idea_set_encrypt_key 402 #define idea_set_encrypt_key private_idea_set_encrypt_key
379 #define SEED_set_key private_SEED_set_key 403 #define SEED_set_key private_SEED_set_key
380 #define RC2_set_key private_RC2_set_key 404 #define RC2_set_key private_RC2_set_key
381 #define RC4_set_key private_RC4_set_key 405 #define RC4_set_key private_RC4_set_key
382 #define DES_set_key_unchecked private_DES_set_key_unchecked 406 #define DES_set_key_unchecked private_DES_set_key_unchecked
383 #define Camellia_set_key private_Camellia_set_key 407 #define Camellia_set_key private_Camellia_set_key
384 408
385 #endif 409 #endif
OLDNEW
« no previous file with comments | « openssl/crypto/evp/evp_err.c ('k') | openssl/crypto/poly1305/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698